Merge branch 'dev' of dev.gitlabhq.com:gitlabhq into dev

2011-10-27 16:47:39 +03:00 · 2011-10-27 16:47:39 +03:00 · 84457708d8
commit 84457708d8
parent d64f23e294 bd219fcc54
134 changed files with 1462 additions and 1475 deletions
--- a/2
+++ b/2
@ -33,7 +33,7 @@ end

 group :development, :test do
  gem 'rspec-rails'
-  gem 'shoulda'
+  gem "shoulda", "~> 3.0.0.beta2"
  gem 'capybara'
  gem 'autotest'
  gem 'autotest-rails'