diff --git a/Gemfile b/Gemfile index 86b89801..f37255b7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.1.0' +gem 'rails', '3.1.3' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' @@ -22,7 +22,7 @@ gem 'css3buttons' # To use debugger # gem 'ruby-debug' -gem 'bcrypt-ruby', :git => 'git://github.com/FooBarWidget/bcrypt-ruby.git' +gem 'bcrypt-ruby' group :development do gem 'guard-livereload' diff --git a/Gemfile.lock b/Gemfile.lock index 2e7fd7f2..68a3d08c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,43 +1,37 @@ -GIT - remote: git://github.com/FooBarWidget/bcrypt-ruby.git - revision: e4f3e000dbfba5a57211399778b6df856978fb6c - specs: - bcrypt-ruby (3.0.0) - GEM remote: http://rubygems.org/ specs: - actionmailer (3.1.0) - actionpack (= 3.1.0) + actionmailer (3.1.3) + actionpack (= 3.1.3) mail (~> 2.3.0) - actionpack (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) + actionpack (3.1.3) + activemodel (= 3.1.3) + activesupport (= 3.1.3) builder (~> 3.0.0) erubis (~> 2.7.0) i18n (~> 0.6) - rack (~> 1.3.2) - rack-cache (~> 1.0.3) + rack (~> 1.3.5) + rack-cache (~> 1.1) rack-mount (~> 0.8.2) rack-test (~> 0.6.1) - sprockets (~> 2.0.0) - activemodel (3.1.0) - activesupport (= 3.1.0) - bcrypt-ruby (~> 3.0.0) + sprockets (~> 2.0.3) + activemodel (3.1.3) + activesupport (= 3.1.3) builder (~> 3.0.0) i18n (~> 0.6) - activerecord (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) + activerecord (3.1.3) + activemodel (= 3.1.3) + activesupport (= 3.1.3) arel (~> 2.2.1) tzinfo (~> 0.3.29) - activeresource (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) - activesupport (3.1.0) + activeresource (3.1.3) + activemodel (= 3.1.3) + activesupport (= 3.1.3) + activesupport (3.1.3) multi_json (~> 1.0) addressable (2.2.6) arel (2.2.1) + bcrypt-ruby (3.0.1) bluecloth (2.2.0) builder (3.0.0) capybara (1.1.2) @@ -102,7 +96,7 @@ GEM orm_adapter (0.0.6) polyglot (0.3.3) rack (1.3.6) - rack-cache (1.0.3) + rack-cache (1.1) rack (>= 0.4) rack-mount (0.8.3) rack (>= 1.0.0) @@ -110,17 +104,17 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.1.0) - actionmailer (= 3.1.0) - actionpack (= 3.1.0) - activerecord (= 3.1.0) - activeresource (= 3.1.0) - activesupport (= 3.1.0) + rails (3.1.3) + actionmailer (= 3.1.3) + actionpack (= 3.1.3) + activerecord (= 3.1.3) + activeresource (= 3.1.3) + activesupport (= 3.1.3) bundler (~> 1.0) - railties (= 3.1.0) - railties (3.1.0) - actionpack (= 3.1.0) - activesupport (= 3.1.0) + railties (= 3.1.3) + railties (3.1.3) + actionpack (= 3.1.3) + activesupport (= 3.1.3) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -181,7 +175,7 @@ PLATFORMS ruby DEPENDENCIES - bcrypt-ruby! + bcrypt-ruby bluecloth capybara capybara-webkit @@ -194,7 +188,7 @@ DEPENDENCIES guard-livereload jquery-rails (>= 1.0.12) launchy - rails (= 3.1.0) + rails (= 3.1.3) rspec-rails (~> 2.4) sass-rails schema_plus