diff --git a/Gemfile b/Gemfile index 9951dc2..f8b58c5 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.0.5' +gem 'rails', '4.0.0' #gem 'bcrypt', '~> 3.1.7' diff --git a/Gemfile.lock b/Gemfile.lock index 3ae7897..38d9933 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,26 +8,26 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.5) - actionpack (= 4.0.5) - mail (~> 2.5.4) - actionpack (4.0.5) - activesupport (= 4.0.5) + 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) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.5) - activesupport (= 4.0.5) + activemodel (4.0.0) + activesupport (= 4.0.0) builder (~> 3.1.0) - activerecord (4.0.5) - activemodel (= 4.0.5) + activerecord (4.0.0) + activemodel (= 4.0.0) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.5) + activesupport (= 4.0.0) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.4) - activesupport (4.0.5) - i18n (~> 0.6, >= 0.6.9) + activesupport (4.0.0) + i18n (~> 0.6, >= 0.6.4) minitest (~> 4.2) multi_json (~> 1.3) thread_safe (~> 0.1) @@ -114,17 +114,17 @@ GEM rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) - rails (4.0.5) - actionmailer (= 4.0.5) - actionpack (= 4.0.5) - activerecord (= 4.0.5) - activesupport (= 4.0.5) + rails (4.0.0) + actionmailer (= 4.0.0) + actionpack (= 4.0.0) + activerecord (= 4.0.0) + activesupport (= 4.0.0) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.5) + railties (= 4.0.0) sprockets-rails (~> 2.0.0) - railties (4.0.5) - actionpack (= 4.0.5) - activesupport (= 4.0.5) + railties (4.0.0) + actionpack (= 4.0.0) + activesupport (= 4.0.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.19.0) @@ -189,7 +189,7 @@ DEPENDENCIES less-rails mysql2 nokogiri - rails (= 4.0.5) + rails (= 4.0.0) rmagick (= 2.16.0) rvm-capistrano sdoc