merge master

This commit is contained in:
Michael Ball 2021-05-04 15:41:29 -07:00
commit 3b9c038947
52 changed files with 787 additions and 140 deletions

View file

@ -171,11 +171,15 @@ GEM
railties (>= 3.0.0)
faker (1.9.3)
i18n (>= 0.7)
faraday (1.3.0)
faraday (1.4.1)
faraday-excon (~> 1.1)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
multipart-post (>= 1.2, < 3)
ruby2_keywords
ruby2_keywords (>= 0.0.4)
faraday-excon (1.1.0)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.1.0)
fastimage (2.1.4)
feature (1.4.0)
ffi (1.10.0)
@ -293,7 +297,7 @@ GEM
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0225)
mimemagic (0.4.3)
mimemagic (0.3.10)
nokogiri (~> 1)
rake
mina (1.2.3)
@ -301,7 +305,7 @@ GEM
rake
mini_magick (4.9.5)
mini_mime (1.0.3)
mini_portile2 (2.5.0)
mini_portile2 (2.5.1)
minitest (5.14.4)
momentjs-rails (2.20.1)
railties (>= 3.1)
@ -320,7 +324,7 @@ GEM
nenv (0.3.0)
netrc (0.11.0)
nio4r (2.5.7)
nokogiri (1.11.2)
nokogiri (1.11.3)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
notiffany (0.1.1)
@ -332,7 +336,7 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
octokit (4.20.0)
octokit (4.21.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
omniauth (1.9.1)
@ -496,7 +500,7 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.2.4)
rexml (3.2.5)
rolify (5.2.0)
rqrcode (0.10.1)
chunky_png (~> 1.0)
@ -637,7 +641,7 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.6.0)
unicode-display_width (1.6.1)
unicode_utils (1.4.0)
unobtrusive_flash (3.3.1)
railties