diff --git a/Gemfile b/Gemfile index 6584224..a3acfb0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.1.1' +gem 'rails', '4.1.2.rc1' # Use sqlite3 as the database for Active Record gem 'sqlite3' diff --git a/Gemfile.lock b/Gemfile.lock index 445a694..d43833c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,27 +11,27 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.1) - actionpack (= 4.1.1) - actionview (= 4.1.1) + actionmailer (4.1.2.rc1) + actionpack (= 4.1.2.rc1) + actionview (= 4.1.2.rc1) mail (~> 2.5.4) - actionpack (4.1.1) - actionview (= 4.1.1) - activesupport (= 4.1.1) + actionpack (4.1.2.rc1) + actionview (= 4.1.2.rc1) + activesupport (= 4.1.2.rc1) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.1) - activesupport (= 4.1.1) + actionview (4.1.2.rc1) + activesupport (= 4.1.2.rc1) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.1) - activesupport (= 4.1.1) + activemodel (4.1.2.rc1) + activesupport (= 4.1.2.rc1) builder (~> 3.1) - activerecord (4.1.1) - activemodel (= 4.1.1) - activesupport (= 4.1.1) + activerecord (4.1.2.rc1) + activemodel (= 4.1.2.rc1) + activesupport (= 4.1.2.rc1) arel (~> 5.0.0) - activesupport (4.1.1) + activesupport (4.1.2.rc1) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -168,19 +168,19 @@ GEM rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (4.1.1) - actionmailer (= 4.1.1) - actionpack (= 4.1.1) - actionview (= 4.1.1) - activemodel (= 4.1.1) - activerecord (= 4.1.1) - activesupport (= 4.1.1) + rails (4.1.2.rc1) + actionmailer (= 4.1.2.rc1) + actionpack (= 4.1.2.rc1) + actionview (= 4.1.2.rc1) + activemodel (= 4.1.2.rc1) + activerecord (= 4.1.2.rc1) + activesupport (= 4.1.2.rc1) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.1) + railties (= 4.1.2.rc1) sprockets-rails (~> 2.0) - railties (4.1.1) - actionpack (= 4.1.1) - activesupport (= 4.1.1) + railties (4.1.2.rc1) + actionpack (= 4.1.2.rc1) + activesupport (= 4.1.2.rc1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.3.2) @@ -238,7 +238,7 @@ GEM libv8 (~> 3.16.14.0) ref thor (0.19.1) - thread_safe (0.3.3) + thread_safe (0.3.4) tilt (1.4.1) tins (1.3.0) treetop (1.4.15) @@ -284,7 +284,7 @@ DEPENDENCIES mocha pg (~> 0.17.0) poltergeist (~> 1.5.0) - rails (= 4.1.1) + rails (= 4.1.2.rc1) rspec-rails sass-rails (~> 4.0.1) sdoc -- libgit2 0.21.2