diff --git a/Gemfile b/Gemfile index 45d562d24..d8c4e6d63 100644 --- a/Gemfile +++ b/Gemfile @@ -31,8 +31,8 @@ gem "mimemagic", "~> 0.3.10" gem "neat", "~> 1.9.1" gem "nokogiri", ">= 1.6.7.2" gem "octokit" -gem "omniauth" -gem "omniauth-github" +gem "omniauth", "~> 1.9.1" +gem "omniauth-github", "~> 1.4.0" gem "paperclip" gem "pg" gem "pg_search" diff --git a/Gemfile.lock b/Gemfile.lock index 4e9aa248a..858243631 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,6 +95,7 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.2.2) aws-eventstream (~> 1, >= 1.0.2) + base64 (0.2.0) bcrypt (3.1.16) bootsnap (1.16.0) msgpack (~> 1.2) @@ -226,7 +227,8 @@ GEM jquery-ui-rails (6.0.1) railties (>= 3.2.16) jsonapi-renderer (0.2.2) - jwt (2.2.2) + jwt (2.8.1) + base64 kaminari (1.2.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.1) @@ -282,25 +284,25 @@ GEM notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - oauth2 (1.4.4) - faraday (>= 0.8, < 2.0) + oauth2 (2.0.9) + faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) - multi_json (~> 1.3) multi_xml (~> 0.5) - rack (>= 1.2, < 3) + rack (>= 1.2, < 4) + snaky_hash (~> 2.0) + version_gem (~> 1.1) octokit (4.19.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - omniauth (2.0.0) + omniauth (1.9.2) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) - rack-protection - omniauth-github (2.0.1) - omniauth (~> 2.0) - omniauth-oauth2 (~> 1.8) - omniauth-oauth2 (1.8.0) + omniauth-github (1.4.0) + omniauth (~> 1.5) + omniauth-oauth2 (>= 1.4.0, < 2.0) + omniauth-oauth2 (1.7.3) oauth2 (>= 1.4, < 3) - omniauth (~> 2.0) + omniauth (>= 1.9, < 3) paperclip (6.1.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) @@ -462,6 +464,9 @@ GEM rack (~> 2.2) rack-protection (= 2.1.0) tilt (~> 2.0) + snaky_hash (2.0.1) + hashie + version_gem (~> 1.1, >= 1.1.1) spring (2.1.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -490,6 +495,7 @@ GEM i18n vanity (3.0.0) i18n + version_gem (1.1.4) webdrivers (4.4.1) nokogiri (~> 1.6) rubyzip (>= 1.3.0) @@ -548,8 +554,8 @@ DEPENDENCIES neat (~> 1.9.1) nokogiri (>= 1.6.7.2) octokit - omniauth - omniauth-github + omniauth (~> 1.9.1) + omniauth-github (~> 1.4.0) paperclip pg pg_search