diff --git a/Gemfile b/Gemfile index 7cb4e7ba..85667cc8 100644 --- a/Gemfile +++ b/Gemfile @@ -2,9 +2,9 @@ source "https://rubygems.org" gemspec -gem "rails", "~> 4.0.0" -gem "omniauth", "~> 1.0.0" -gem "omniauth-oauth2", "~> 1.0.0" +gem "rails", "~> 4.1.0" +gem "omniauth", "~> 1.2.0" +gem "omniauth-oauth2", "~> 1.1.0" gem "rdoc" group :test do diff --git a/Gemfile.lock b/Gemfile.lock index e481eec3..52518b52 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/mongoid/mongoid.git - revision: dba1c17b1dba667e50347ab616aaf6f2e1bee094 + revision: e93a4837b0266db46c24aae172e184f57c847b04 branch: master specs: mongoid (4.0.0.beta1) @@ -22,123 +22,130 @@ PATH GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.0) - actionpack (= 4.0.0) - mail (~> 2.5.3) - actionpack (4.0.0) - activesupport (= 4.0.0) - builder (~> 3.1.0) - erubis (~> 2.7.0) + actionmailer (4.1.0) + actionpack (= 4.1.0) + actionview (= 4.1.0) + mail (~> 2.5.4) + actionpack (4.1.0) + actionview (= 4.1.0) + activesupport (= 4.1.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.0) - activesupport (= 4.0.0) - builder (~> 3.1.0) - activerecord (4.0.0) - activemodel (= 4.0.0) - activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.0) - arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.3) - activesupport (4.0.0) - i18n (~> 0.6, >= 0.6.4) - minitest (~> 4.2) - multi_json (~> 1.3) + actionview (4.1.0) + activesupport (= 4.1.0) + builder (~> 3.1) + erubis (~> 2.7.0) + activemodel (4.1.0) + activesupport (= 4.1.0) + builder (~> 3.1) + activerecord (4.1.0) + activemodel (= 4.1.0) + activesupport (= 4.1.0) + arel (~> 5.0.0) + activesupport (4.1.0) + i18n (~> 0.6, >= 0.6.9) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) thread_safe (~> 0.1) - tzinfo (~> 0.3.37) - arel (4.0.0) - atomic (1.1.16) + tzinfo (~> 1.1) + arel (5.0.1.20140414130214) bcrypt (3.1.7) - bson (2.2.1) - builder (3.1.4) - connection_pool (1.2.0) + bson (2.2.2) + builder (3.2.2) + connection_pool (2.0.0) erubis (2.7.0) - faraday (0.8.8) - multipart-post (~> 1.2.0) - hashie (1.2.0) + faraday (0.9.0) + multipart-post (>= 1.2, < 3) + hashie (2.1.1) hike (1.2.3) - httpauth (0.2.0) i18n (0.6.9) - json (1.8.0) - jwt (0.1.8) + json (1.8.1) + jwt (0.1.11) multi_json (>= 1.5) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) metaclass (0.0.4) - mime-types (1.23) - minitest (4.7.5) + mime-types (1.25.1) + mini_portile (0.5.3) + minitest (5.3.3) 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.9.2) - multipart-post (1.2.0) - nokogiri (1.5.9) - oauth2 (0.8.1) - faraday (~> 0.8) - httpauth (~> 0.1) - jwt (~> 0.1.4) - multi_json (~> 1.0) + 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.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) - rails (4.0.0) - actionmailer (= 4.0.0) - actionpack (= 4.0.0) - activerecord (= 4.0.0) - activesupport (= 4.0.0) + rails (4.1.0) + actionmailer (= 4.1.0) + actionpack (= 4.1.0) + actionview (= 4.1.0) + activemodel (= 4.1.0) + activerecord (= 4.1.0) + activesupport (= 4.1.0) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.0) - sprockets-rails (~> 2.0.0) - railties (4.0.0) - actionpack (= 4.0.0) - activesupport (= 4.0.0) + railties (= 4.1.0) + sprockets-rails (~> 2.0) + railties (4.1.0) + actionpack (= 4.1.0) + activesupport (= 4.1.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.1.0) - rdoc (4.0.1) + rake (10.3.1) + rdoc (4.1.1) json (~> 1.4) - ruby-openid (2.2.3) - sprockets (2.10.0) + ruby-openid (2.5.0) + sprockets (2.12.1) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.0) + sprockets-rails (2.1.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) - sqlite3 (1.3.7) - thor (0.18.1) - thread_safe (0.3.1) - atomic (>= 1.1.7, < 2) + sqlite3 (1.3.9) + thor (0.19.1) + thread_safe (0.3.3) tilt (1.4.1) - treetop (1.4.14) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.39) + tzinfo (1.1.0) + thread_safe (~> 0.1) warden (1.2.3) rack (>= 1.0) webrat (0.7.3) @@ -156,11 +163,11 @@ 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 (~> 4.0.0) + rails (~> 4.1.0) rdoc sqlite3 webrat (= 0.7.3)