diff --git a/Gemfile b/Gemfile index 3eab6209..43869ec3 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" gemspec -gem "rails", "4.2.0.beta2" +gem "rails", "4.2.0.rc1" gem "omniauth", "~> 1.2.0" gem "omniauth-oauth2", "~> 1.1.0" gem "rdoc" diff --git a/Gemfile.lock b/Gemfile.lock index f78f1b7a..e7a9eb9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/mongoid/mongoid.git - revision: f4f489e45adb0059fae6854d8a29ebb79cc6c8fd + revision: 90567eab72caa136bae6efcfcf61a6e929e9299c branch: master specs: mongoid (4.0.0) @@ -23,42 +23,42 @@ PATH GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.0.beta2) - actionpack (= 4.2.0.beta2) - actionview (= 4.2.0.beta2) - activejob (= 4.2.0.beta2) + actionmailer (4.2.0.rc1) + actionpack (= 4.2.0.rc1) + actionview (= 4.2.0.rc1) + activejob (= 4.2.0.rc1) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.3) - actionpack (4.2.0.beta2) - actionview (= 4.2.0.beta2) - activesupport (= 4.2.0.beta2) - rack (~> 1.6.0.beta) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.0.rc1) + actionview (= 4.2.0.rc1) + activesupport (= 4.2.0.rc1) + rack (~> 1.6.0.beta2) rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.3) + rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.1) - actionview (4.2.0.beta2) - activesupport (= 4.2.0.beta2) + actionview (4.2.0.rc1) + activesupport (= 4.2.0.rc1) builder (~> 3.1) erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.3) + rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.1) - activejob (4.2.0.beta2) - activesupport (= 4.2.0.beta2) + activejob (4.2.0.rc1) + activesupport (= 4.2.0.rc1) globalid (>= 0.3.0) - activemodel (4.2.0.beta2) - activesupport (= 4.2.0.beta2) + activemodel (4.2.0.rc1) + activesupport (= 4.2.0.rc1) builder (~> 3.1) - activerecord (4.2.0.beta2) - activemodel (= 4.2.0.beta2) - activesupport (= 4.2.0.beta2) - arel (>= 6.0.0.beta1, < 6.1) - activesupport (4.2.0.beta2) + activerecord (4.2.0.rc1) + activemodel (= 4.2.0.rc1) + activesupport (= 4.2.0.rc1) + arel (~> 6.0) + activesupport (4.2.0.rc1) i18n (>= 0.7.0.beta1, < 0.8) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - arel (6.0.0.beta2) + arel (6.0.0) bcrypt (3.1.9) bson (2.3.0) builder (3.2.2) @@ -68,11 +68,11 @@ GEM multipart-post (>= 1.2, < 3) globalid (0.3.0) activesupport (>= 4.1.0) - hashie (3.3.1) + hashie (3.3.2) hike (1.2.3) i18n (0.7.0.beta1) json (1.8.1) - jwt (1.0.0) + jwt (1.2.0) loofah (2.0.1) nokogiri (>= 1.5.9) mail (2.6.3) @@ -90,7 +90,7 @@ GEM multi_json (1.10.1) multi_xml (0.5.5) multipart-post (2.0.0) - nokogiri (1.6.4.1) + nokogiri (1.6.5) mini_portile (~> 0.6.0) oauth2 (0.9.4) faraday (>= 0.8, < 0.10) @@ -114,37 +114,37 @@ GEM optionable (0.2.0) origin (2.1.1) orm_adapter (0.5.0) - rack (1.6.0.beta) + rack (1.6.0.beta2) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (0.6.2) rack (>= 1.0) - rails (4.2.0.beta2) - actionmailer (= 4.2.0.beta2) - actionpack (= 4.2.0.beta2) - actionview (= 4.2.0.beta2) - activejob (= 4.2.0.beta2) - activemodel (= 4.2.0.beta2) - activerecord (= 4.2.0.beta2) - activesupport (= 4.2.0.beta2) + rails (4.2.0.rc1) + actionmailer (= 4.2.0.rc1) + actionpack (= 4.2.0.rc1) + actionview (= 4.2.0.rc1) + activejob (= 4.2.0.rc1) + activemodel (= 4.2.0.rc1) + activerecord (= 4.2.0.rc1) + activesupport (= 4.2.0.rc1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.0.beta2) - sprockets-rails (~> 3.0.0.beta1) + railties (= 4.2.0.rc1) + sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.4) + rails-dom-testing (1.0.5) activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.1) loofah (~> 2.0) - railties (4.2.0.beta2) - actionpack (= 4.2.0.beta2) - activesupport (= 4.2.0.beta2) + railties (4.2.0.rc1) + actionpack (= 4.2.0.rc1) + activesupport (= 4.2.0.rc1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.3.2) + rake (10.4.0) rdoc (4.1.2) json (~> 1.4) responders (2.0.2) @@ -155,10 +155,10 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (3.0.0.beta1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (~> 2.8) + sprockets-rails (2.2.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (>= 2.8, < 4.0) sqlite3 (1.3.10) thor (0.19.1) thread_safe (0.3.4) @@ -186,7 +186,7 @@ DEPENDENCIES omniauth-facebook omniauth-oauth2 (~> 1.1.0) omniauth-openid (~> 1.0.1) - rails (= 4.2.0.beta2) + rails (= 4.2.0.rc1) rdoc sqlite3 webrat (= 0.7.3)