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.lock | |
| 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.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 44faaad7b70..83ccebd89b0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -200,7 +200,11 @@ GEM ffi (>= 1.0.7) json_pure rubyzip - shoulda (2.11.3) + shoulda (3.0.0.beta2) + shoulda-context (~> 1.0.0.beta1) + shoulda-matchers (~> 1.0.0.beta1) + shoulda-context (1.0.0.beta1) + shoulda-matchers (1.0.0.beta3) simplecov (0.5.3) multi_json (~> 1.0.3) simplecov-html (~> 0.5.3) @@ -264,7 +268,7 @@ DEPENDENCIES ruby-debug19 sass-rails (~> 3.1.0) seed-fu! - shoulda + shoulda (~> 3.0.0.beta2) simplecov six sqlite3 |