diff --git a/Gemfile b/Gemfile index 56b744a0..43ada899 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" gemspec -gem "rails", "4.2.0.rc3" +gem "rails", "4.2.0" gem "omniauth", "~> 1.2.0" gem "omniauth-oauth2", "~> 1.1.0" gem "rdoc" diff --git a/Gemfile.lock b/Gemfile.lock index de6ecba7..df08756b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/mongoid/mongoid.git - revision: 90567eab72caa136bae6efcfcf61a6e929e9299c + revision: a4365d7ecfa8221bfcf36a4e7ce7993142fc5940 branch: master specs: mongoid (4.0.0) @@ -23,40 +23,40 @@ PATH GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.0.rc3) - actionpack (= 4.2.0.rc3) - actionview (= 4.2.0.rc3) - activejob (= 4.2.0.rc3) + actionmailer (4.2.0) + actionpack (= 4.2.0) + actionview (= 4.2.0) + activejob (= 4.2.0) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.0.rc3) - actionview (= 4.2.0.rc3) - activesupport (= 4.2.0.rc3) - rack (~> 1.6.0.beta2) + actionpack (4.2.0) + actionview (= 4.2.0) + activesupport (= 4.2.0) + rack (~> 1.6.0) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.1) - actionview (4.2.0.rc3) - activesupport (= 4.2.0.rc3) + actionview (4.2.0) + activesupport (= 4.2.0) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.1) - activejob (4.2.0.rc3) - activesupport (= 4.2.0.rc3) + activejob (4.2.0) + activesupport (= 4.2.0) globalid (>= 0.3.0) - activemodel (4.2.0.rc3) - activesupport (= 4.2.0.rc3) + activemodel (4.2.0) + activesupport (= 4.2.0) builder (~> 3.1) - activerecord (4.2.0.rc3) - activemodel (= 4.2.0.rc3) - activesupport (= 4.2.0.rc3) + activerecord (4.2.0) + activemodel (= 4.2.0) + activesupport (= 4.2.0) arel (~> 6.0) - activesupport (4.2.0.rc3) - i18n (>= 0.7.0.beta1, < 0.8) + activesupport (4.2.0) + i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) - thread_safe (~> 0.1) + thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) arel (6.0.0) bcrypt (3.1.9) @@ -70,7 +70,7 @@ GEM activesupport (>= 4.1.0) hashie (3.3.2) hike (1.2.3) - i18n (0.7.0.beta1) + i18n (0.7.0) json (1.8.1) jwt (1.2.0) loofah (2.0.1) @@ -114,22 +114,22 @@ GEM optionable (0.2.0) origin (2.1.1) orm_adapter (0.5.0) - rack (1.6.0.beta2) + rack (1.6.0) 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.rc3) - actionmailer (= 4.2.0.rc3) - actionpack (= 4.2.0.rc3) - actionview (= 4.2.0.rc3) - activejob (= 4.2.0.rc3) - activemodel (= 4.2.0.rc3) - activerecord (= 4.2.0.rc3) - activesupport (= 4.2.0.rc3) + rails (4.2.0) + actionmailer (= 4.2.0) + actionpack (= 4.2.0) + actionview (= 4.2.0) + activejob (= 4.2.0) + activemodel (= 4.2.0) + activerecord (= 4.2.0) + activesupport (= 4.2.0) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.0.rc3) + railties (= 4.2.0) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -139,14 +139,13 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.1) loofah (~> 2.0) - railties (4.2.0.rc3) - actionpack (= 4.2.0.rc3) - activesupport (= 4.2.0.rc3) + railties (4.2.0) + actionpack (= 4.2.0) + activesupport (= 4.2.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) - rdoc (4.1.2) - json (~> 1.4) + rdoc (4.2.0) responders (2.0.2) railties (>= 4.2.0.alpha, < 5) ruby-openid (2.6.0) @@ -186,7 +185,7 @@ DEPENDENCIES omniauth-facebook omniauth-oauth2 (~> 1.1.0) omniauth-openid (~> 1.0.1) - rails (= 4.2.0.rc3) + rails (= 4.2.0) rdoc sqlite3 webrat (= 0.7.3)