From 593ae41f9dac165a404b05cd3abd959245c64908 Mon Sep 17 00:00:00 2001 From: Lucas Mazza Date: Wed, 18 May 2016 13:59:06 -0300 Subject: [PATCH] Update existing Gemfiles. --- Gemfile | 6 ++--- Gemfile.lock | 34 ++++++++++++++------------ gemfiles/Gemfile.rails-4.1-stable | 8 +++--- gemfiles/Gemfile.rails-4.1-stable.lock | 30 ++++++++++++----------- gemfiles/Gemfile.rails-4.2-stable | 8 +++--- gemfiles/Gemfile.rails-4.2-stable.lock | 34 ++++++++++++++------------ 6 files changed, 63 insertions(+), 57 deletions(-) diff --git a/Gemfile b/Gemfile index 738aba2d..48640eba 100644 --- a/Gemfile +++ b/Gemfile @@ -3,13 +3,13 @@ source "https://rubygems.org" gemspec gem "rails", "~> 4.2.6" -gem "omniauth", "~> 1.3" -gem "omniauth-oauth2", "~> 1.4" +gem "omniauth" +gem "omniauth-oauth2" gem "rdoc" group :test do gem "omniauth-facebook" - gem "omniauth-openid", "~> 1.0.1" + gem "omniauth-openid" gem "webrat", "0.7.3", require: false gem "mocha", "~> 1.1", require: false gem 'test_after_commit', require: false diff --git a/Gemfile.lock b/Gemfile.lock index ffabf1ed..3054c2fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,36 +48,38 @@ GEM tzinfo (~> 1.1) arel (6.0.3) bcrypt (3.1.11) - bson (4.0.0) + bson (4.1.1) builder (3.2.2) - concurrent-ruby (1.0.1) + concurrent-ruby (1.0.2) erubis (2.7.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) globalid (0.3.6) activesupport (>= 4.1.0) - hashie (3.4.3) + hashie (3.4.4) i18n (0.7.0) json (1.8.3) jwt (1.5.1) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.6.4) + mime-types (>= 1.16, < 4) metaclass (0.0.4) - mime-types (2.99.1) + mime-types (3.0) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0221) mini_portile2 (2.0.0) - minitest (5.8.4) + minitest (5.9.0) mocha (1.1.0) metaclass (~> 0.0.1) - mongo (2.2.0) + mongo (2.2.5) bson (~> 4.0) - mongoid (5.0.1) + mongoid (5.1.3) activemodel (~> 4.0) mongo (~> 2.1) - origin (~> 2.1) + origin (~> 2.2) tzinfo (>= 0.3.37) - multi_json (1.11.2) + multi_json (1.12.0) multi_xml (0.5.5) multipart-post (2.0.0) nokogiri (1.6.7.2) @@ -131,13 +133,13 @@ GEM activesupport (= 4.2.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (11.0.1) + rake (11.1.2) rdoc (4.2.2) json (~> 1.4) responders (2.2.0) railties (>= 4.2.0, < 5.1) ruby-openid (2.7.0) - sprockets (3.5.2) + sprockets (3.6.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.0.4) @@ -168,10 +170,10 @@ DEPENDENCIES jruby-openssl mocha (~> 1.1) mongoid (~> 5.0) - omniauth (~> 1.3) + omniauth omniauth-facebook - omniauth-oauth2 (~> 1.4) - omniauth-openid (~> 1.0.1) + omniauth-oauth2 + omniauth-openid rails (~> 4.2.6) rdoc sqlite3 diff --git a/gemfiles/Gemfile.rails-4.1-stable b/gemfiles/Gemfile.rails-4.1-stable index aa966c1c..2dde99dd 100644 --- a/gemfiles/Gemfile.rails-4.1-stable +++ b/gemfiles/Gemfile.rails-4.1-stable @@ -3,13 +3,13 @@ source "https://rubygems.org" gemspec path: ".." gem "rails", github: "rails/rails", branch: "4-1-stable" -gem "omniauth", "~> 1.3" -gem "omniauth-oauth2", "~> 1.4" +gem "omniauth" +gem "omniauth-oauth2" gem "rdoc" group :test do gem "omniauth-facebook" - gem "omniauth-openid", "~> 1.0.1" + gem "omniauth-openid" gem "webrat", "0.7.3", require: false gem "mocha", "~> 1.1", require: false gem 'test_after_commit', require: false @@ -26,5 +26,5 @@ platforms :ruby do end group :mongoid do - gem "mongoid", "~> 4.0.0" + gem "mongoid", "~> 4.0" end diff --git a/gemfiles/Gemfile.rails-4.1-stable.lock b/gemfiles/Gemfile.rails-4.1-stable.lock index 76652824..05ad1c53 100644 --- a/gemfiles/Gemfile.rails-4.1-stable.lock +++ b/gemfiles/Gemfile.rails-4.1-stable.lock @@ -48,7 +48,7 @@ GIT PATH remote: .. specs: - devise (4.0.1) + devise (4.1.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.1) @@ -62,21 +62,23 @@ GEM bcrypt (3.1.11) bson (3.2.6) builder (3.2.2) - concurrent-ruby (1.0.1) + concurrent-ruby (1.0.2) connection_pool (2.2.0) erubis (2.7.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - hashie (3.4.3) + hashie (3.4.4) i18n (0.7.0) json (1.8.3) jwt (1.5.1) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.6.4) + mime-types (>= 1.16, < 4) metaclass (0.0.4) - mime-types (2.99.1) + mime-types (3.0) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0221) mini_portile2 (2.0.0) - minitest (5.8.4) + minitest (5.9.0) mocha (1.1.0) metaclass (~> 0.0.1) mongoid (4.0.2) @@ -88,7 +90,7 @@ GEM bson (~> 3.0) connection_pool (~> 2.0) optionable (~> 0.2.0) - multi_json (1.11.2) + multi_json (1.12.0) multi_xml (0.5.5) multipart-post (2.0.0) nokogiri (1.6.7.2) @@ -119,13 +121,13 @@ GEM ruby-openid (>= 2.1.8) rack-test (0.6.3) rack (>= 1.0) - rake (11.0.1) + rake (11.1.2) rdoc (4.2.2) json (~> 1.4) responders (1.1.2) railties (>= 3.2, < 4.2) ruby-openid (2.7.0) - sprockets (3.5.2) + sprockets (3.6.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (2.3.3) @@ -155,11 +157,11 @@ DEPENDENCIES devise! jruby-openssl mocha (~> 1.1) - mongoid (~> 4.0.0) - omniauth (~> 1.3) + mongoid (~> 4.0) + omniauth omniauth-facebook - omniauth-oauth2 (~> 1.4) - omniauth-openid (~> 1.0.1) + omniauth-oauth2 + omniauth-openid rails! rdoc sqlite3 diff --git a/gemfiles/Gemfile.rails-4.2-stable b/gemfiles/Gemfile.rails-4.2-stable index 10c0c1b6..8165a950 100644 --- a/gemfiles/Gemfile.rails-4.2-stable +++ b/gemfiles/Gemfile.rails-4.2-stable @@ -3,13 +3,13 @@ source "https://rubygems.org" gemspec path: ".." gem "rails", github: "rails/rails", branch: "4-2-stable" -gem "omniauth", "~> 1.3" -gem "omniauth-oauth2", "~> 1.4" +gem "omniauth" +gem "omniauth-oauth2" gem "rdoc" group :test do gem "omniauth-facebook" - gem "omniauth-openid", "~> 1.0.1" + gem "omniauth-openid" gem "webrat", "0.7.3", require: false gem "mocha", "~> 1.1", require: false gem 'test_after_commit', require: false @@ -26,5 +26,5 @@ platforms :ruby do end group :mongoid do - gem "mongoid", "~> 4.0.0" + gem "mongoid", "~> 4.0" end diff --git a/gemfiles/Gemfile.rails-4.2-stable.lock b/gemfiles/Gemfile.rails-4.2-stable.lock index 751c8d35..9f353204 100644 --- a/gemfiles/Gemfile.rails-4.2-stable.lock +++ b/gemfiles/Gemfile.rails-4.2-stable.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/rails/rails.git - revision: 2aa27582c202148296bb169159b0bf9a47a7bd80 + revision: 5be7cfa46e055148c8b74ac5d48982a3435f477c branch: 4-2-stable specs: actionmailer (4.2.6) @@ -58,7 +58,7 @@ GIT PATH remote: .. specs: - devise (4.0.1) + devise (4.1.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.1) @@ -72,25 +72,27 @@ GEM bcrypt (3.1.11) bson (3.2.6) builder (3.2.2) - concurrent-ruby (1.0.1) + concurrent-ruby (1.0.2) connection_pool (2.2.0) erubis (2.7.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) globalid (0.3.6) activesupport (>= 4.1.0) - hashie (3.4.3) + hashie (3.4.4) i18n (0.7.0) json (1.8.3) jwt (1.5.1) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.6.4) + mime-types (>= 1.16, < 4) metaclass (0.0.4) - mime-types (2.99.1) + mime-types (3.0) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0221) mini_portile2 (2.0.0) - minitest (5.8.4) + minitest (5.9.0) mocha (1.1.0) metaclass (~> 0.0.1) mongoid (4.0.2) @@ -102,7 +104,7 @@ GEM bson (~> 3.0) connection_pool (~> 2.0) optionable (~> 0.2.0) - multi_json (1.11.2) + multi_json (1.12.0) multi_xml (0.5.5) multipart-post (2.0.0) nokogiri (1.6.7.2) @@ -141,13 +143,13 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - rake (11.0.1) + rake (11.1.2) rdoc (4.2.2) json (~> 1.4) - responders (2.1.2) + responders (2.2.0) railties (>= 4.2.0, < 5.1) ruby-openid (2.7.0) - sprockets (3.5.2) + sprockets (3.6.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.0.4) @@ -177,11 +179,11 @@ DEPENDENCIES devise! jruby-openssl mocha (~> 1.1) - mongoid (~> 4.0.0) - omniauth (~> 1.3) + mongoid (~> 4.0) + omniauth omniauth-facebook - omniauth-oauth2 (~> 1.4) - omniauth-openid (~> 1.0.1) + omniauth-oauth2 + omniauth-openid rails! rdoc sqlite3