From 4110ab3228aea7a4acff869e9b3a16bdada067e0 Mon Sep 17 00:00:00 2001 From: Lucas Mazza Date: Sun, 4 May 2014 21:30:06 -0300 Subject: [PATCH] Update 4-0-stable Gemfile dependencies. --- gemfiles/Gemfile.rails-4.0-stable | 4 +- gemfiles/Gemfile.rails-4.0-stable.lock | 112 ++++++++++++------------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/gemfiles/Gemfile.rails-4.0-stable b/gemfiles/Gemfile.rails-4.0-stable index d09acddd..3688a50e 100644 --- a/gemfiles/Gemfile.rails-4.0-stable +++ b/gemfiles/Gemfile.rails-4.0-stable @@ -3,8 +3,8 @@ source "https://rubygems.org" gemspec path: '..' gem "rails", github: 'rails/rails', branch: '4-0-stable' -gem "omniauth", "~> 1.0.0" -gem "omniauth-oauth2", "~> 1.0.0" +gem "omniauth", "~> 1.2.0" +gem "omniauth-oauth2", "~> 1.1.0" gem "rdoc" group :test do diff --git a/gemfiles/Gemfile.rails-4.0-stable.lock b/gemfiles/Gemfile.rails-4.0-stable.lock index a5b66ea5..78742d59 100644 --- a/gemfiles/Gemfile.rails-4.0-stable.lock +++ b/gemfiles/Gemfile.rails-4.0-stable.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/mongoid/mongoid.git - revision: 5b0f031992cbec66d68c6cb288a4edb952ed5336 + revision: e93a4837b0266db46c24aae172e184f57c847b04 branch: master specs: mongoid (4.0.0.beta1) @@ -11,43 +11,43 @@ GIT GIT remote: git://github.com/rails/rails.git - revision: ccb0301bd43a385305f2d000aa085407926a1059 + revision: 2961fa8819e4d6a4007dbe54209a3de893b3604f branch: 4-0-stable specs: - actionmailer (4.0.2) - actionpack (= 4.0.2) + actionmailer (4.0.4) + actionpack (= 4.0.4) mail (~> 2.5.4) - actionpack (4.0.2) - activesupport (= 4.0.2) + actionpack (4.0.4) + activesupport (= 4.0.4) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.2) - activesupport (= 4.0.2) + activemodel (4.0.4) + activesupport (= 4.0.4) builder (~> 3.1.0) - activerecord (4.0.2) - activemodel (= 4.0.2) + activerecord (4.0.4) + activemodel (= 4.0.4) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.2) + activesupport (= 4.0.4) arel (~> 4.0.0) - activesupport (4.0.2) + activesupport (4.0.4) i18n (~> 0.6, >= 0.6.9) minitest (~> 4.2) multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - rails (4.0.2) - actionmailer (= 4.0.2) - actionpack (= 4.0.2) - activerecord (= 4.0.2) - activesupport (= 4.0.2) + rails (4.0.4) + actionmailer (= 4.0.4) + actionpack (= 4.0.4) + activerecord (= 4.0.4) + activesupport (= 4.0.4) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.2) - sprockets-rails (~> 2.0.0) - railties (4.0.2) - actionpack (= 4.0.2) - activesupport (= 4.0.2) + railties (= 4.0.4) + sprockets-rails (~> 2.0) + railties (4.0.4) + actionpack (= 4.0.4) + activesupport (= 4.0.4) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -66,17 +66,15 @@ GEM specs: activerecord-deprecated_finders (1.0.3) arel (4.0.2) - atomic (1.1.14) bcrypt (3.1.7) - bson (2.2.0) + bson (2.2.2) builder (3.1.4) - connection_pool (1.2.0) + connection_pool (2.0.0) erubis (2.7.0) faraday (0.9.0) multipart-post (>= 1.2, < 3) - hashie (1.2.0) + hashie (2.1.1) hike (1.2.3) - httpauth (0.2.1) i18n (0.6.9) json (1.8.1) jwt (0.1.11) @@ -86,67 +84,69 @@ GEM treetop (~> 1.4.8) metaclass (0.0.4) mime-types (1.25.1) - mini_portile (0.5.2) + mini_portile (0.5.3) minitest (4.7.5) mocha (1.0.0) metaclass (~> 0.0.1) - moped (2.0.0.beta6) + moped (2.0.0.rc1) bson (~> 2.2) - connection_pool (~> 1.2) + connection_pool (~> 2.0) optionable (~> 0.2.0) - multi_json (1.8.4) + multi_json (1.9.3) + multi_xml (0.5.5) multipart-post (2.0.0) nokogiri (1.6.1) mini_portile (~> 0.5.0) - oauth2 (0.8.1) - faraday (~> 0.8) - httpauth (~> 0.1) - jwt (~> 0.1.4) - multi_json (~> 1.0) + oauth2 (0.9.3) + faraday (>= 0.8, < 0.10) + jwt (~> 0.1.8) + multi_json (~> 1.3) + multi_xml (~> 0.5) rack (~> 1.2) - omniauth (1.0.3) - hashie (~> 1.2) - rack - omniauth-facebook (1.4.0) - omniauth-oauth2 (~> 1.0.2) - omniauth-oauth2 (1.0.3) - oauth2 (~> 0.8.0) - omniauth (~> 1.0) + omniauth (1.2.1) + hashie (>= 1.2, < 3) + rack (~> 1.0) + omniauth-facebook (1.6.0) + omniauth-oauth2 (~> 1.1) + omniauth-oauth2 (1.1.2) + faraday (>= 0.8, < 0.10) + multi_json (~> 1.3) + oauth2 (~> 0.9.3) + omniauth (~> 1.2) omniauth-openid (1.0.1) omniauth (~> 1.0) rack-openid (~> 1.3.1) optionable (0.2.0) - origin (2.1.0) + origin (2.1.1) orm_adapter (0.5.0) - polyglot (0.3.3) + polyglot (0.3.4) rack (1.5.2) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (0.6.2) rack (>= 1.0) - rake (10.1.1) + rake (10.3.1) rdoc (4.1.1) json (~> 1.4) ruby-openid (2.5.0) - sprockets (2.10.1) + sprockets (2.12.1) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.1) + sprockets-rails (2.1.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) - sqlite3 (1.3.8) - thor (0.18.1) - thread_safe (0.1.3) - atomic + sqlite3 (1.3.9) + thor (0.19.1) + thread_safe (0.3.3) tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.38) + tzinfo (0.3.39) warden (1.2.3) rack (>= 1.0) webrat (0.7.3) @@ -164,9 +164,9 @@ DEPENDENCIES jruby-openssl mocha (~> 1.0.0) mongoid! - omniauth (~> 1.0.0) + omniauth (~> 1.2.0) omniauth-facebook - omniauth-oauth2 (~> 1.0.0) + omniauth-oauth2 (~> 1.1.0) omniauth-openid (~> 1.0.1) rails! rdoc