diff options
| author | Alex Denisov <1101.debian@gmail.com> | 2012-09-07 09:39:34 +0300 |
|---|---|---|
| committer | Alex Denisov <1101.debian@gmail.com> | 2012-09-07 09:39:34 +0300 |
| commit | ed4fbcf6b004bacfe9ad3c99296d543921c477ed (patch) | |
| tree | 61d45559d8e3a628d41b72e5aa512770ef50a8cb /Gemfile.lock | |
| parent | 38b17e4e063506b499ddebdff275d1d11e2f97b6 (diff) | |
| parent | 5cb9e7eedc24c418bbb3bce2f48a7c585f9cb439 (diff) | |
| download | gitlab-ce-ed4fbcf6b004bacfe9ad3c99296d543921c477ed.tar.gz | |
Merge branch 'master' into fix_project_access_notification
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index da6c068b23f..235c49a6c00 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -323,7 +323,7 @@ GEM multi_json (~> 1.0) rubyzip settingslogic (2.0.8) - shoulda-matchers (1.1.0) + shoulda-matchers (1.3.0) activesupport (>= 3.0.0) simplecov (0.6.4) multi_json (~> 1.0) |