diff --git a/Gemfile b/Gemfile index 92e07c0..9b3796e 100755 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' #don't upgrade -gem 'rails', '4.0.10' +gem 'rails', '4.0.12' ruby '2.1.5' diff --git a/Gemfile.lock b/Gemfile.lock index b7d279e..2737757 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,25 +1,25 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.10) - actionpack (= 4.0.10) + actionmailer (4.0.12) + actionpack (= 4.0.12) mail (~> 2.5, >= 2.5.4) - actionpack (4.0.10) - activesupport (= 4.0.10) + actionpack (4.0.12) + activesupport (= 4.0.12) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.10) - activesupport (= 4.0.10) + activemodel (4.0.12) + activesupport (= 4.0.12) builder (~> 3.1.0) - activerecord (4.0.10) - activemodel (= 4.0.10) + activerecord (4.0.12) + activemodel (= 4.0.12) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.10) + activesupport (= 4.0.12) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.3) - activesupport (4.0.10) + activesupport (4.0.12) i18n (~> 0.6, >= 0.6.9) minitest (~> 4.2) multi_json (~> 1.3) @@ -187,17 +187,17 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (4.0.10) - actionmailer (= 4.0.10) - actionpack (= 4.0.10) - activerecord (= 4.0.10) - activesupport (= 4.0.10) + rails (4.0.12) + actionmailer (= 4.0.12) + actionpack (= 4.0.12) + activerecord (= 4.0.12) + activesupport (= 4.0.12) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.10) + railties (= 4.0.12) sprockets-rails (~> 2.0) - railties (4.0.10) - actionpack (= 4.0.10) - activesupport (= 4.0.10) + railties (4.0.12) + actionpack (= 4.0.12) + activesupport (= 4.0.12) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) @@ -325,7 +325,7 @@ DEPENDENCIES powder pry rack-livereload - rails (= 4.0.10) + rails (= 4.0.12) rb-fsevent rspec-rails (= 2.14.2) sass-rails