diff --git a/.gitignore b/.gitignore index 91e987e1c..40116a515 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ tmp/**/* Gemfile.lock gpg/diaspora-development/*.gpg gpg/diaspora-production/*.gpg +gpg/*/random_seed diff --git a/Gemfile b/Gemfile index a5df7bd95..e244b25a4 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' source 'http://gemcutter.org' gem 'rails', '3.0.0.beta4' -gem 'bundler' +gem 'bundler', '0.9.26' gem 'mongo_mapper', :git => "http://github.com/BadMinus/mongomapper.git" gem 'devise', :git => "http://github.com/BadMinus/devise.git" gem 'jnunemaker-validatable', :git => "http://github.com/BadMinus/validatable.git" @@ -25,8 +25,8 @@ gem 'will_paginate', '3.0.pre' group :test do - gem 'rspec', '>= 2.0.0.beta.12' - gem 'rspec-rails' + gem 'rspec', '>= 2.0.0.beta.17' + gem 'rspec-rails', '2.0.0.beta.17' gem "mocha" gem 'webrat' gem 'redgreen'