diff options
| author | DZ <dzaporozhets@sphereconsultinginc.com> | 2011-10-27 16:47:39 +0300 |
|---|---|---|
| committer | DZ <dzaporozhets@sphereconsultinginc.com> | 2011-10-27 16:47:39 +0300 |
| commit | 84457708d8704f23de6a974a8dce0995ce0d03ea (patch) | |
| tree | 33601d85a4169d8073a89b0d5ec6d35f929c6bdb /Gemfile | |
| parent | d64f23e29419c92c36a0f64917563336ed6012e3 (diff) | |
| parent | bd219fcc54adfd136ca7111c2f2bb00996297938 (diff) | |
| download | gitlab-ce-84457708d8704f23de6a974a8dce0995ce0d03ea.tar.gz | |
Merge branch 'dev' of dev.gitlabhq.com:gitlabhq into dev
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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' |