diff options
| author | Job van der Voort <jobvandervoort@gmail.com> | 2015-01-06 12:32:41 +0100 |
|---|---|---|
| committer | Job van der Voort <jobvandervoort@gmail.com> | 2015-01-06 12:32:41 +0100 |
| commit | c4700725239af627dec1340ea9ec834f7076eea8 (patch) | |
| tree | 7337115e6dfa8c8d32a6b34af999e9130bba0d2f /Gemfile.lock | |
| parent | 446390e61c8aa7dc9ae40b720e7c9299ab1da4b2 (diff) | |
| parent | d884c210049b59b4cfcbb2c9bd162595acad7204 (diff) | |
| download | gitlab-ce-c4700725239af627dec1340ea9ec834f7076eea8.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 554223b83c9..55861ae53ce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -183,7 +183,7 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.0.1.1) emoji (~> 1.0.1) - gitlab_git (7.0.0.rc12) + gitlab_git (7.0.0.rc13) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) @@ -643,7 +643,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 3.0.0) gitlab_emoji (~> 0.0.1.1) - gitlab_git (= 7.0.0.rc12) + gitlab_git (= 7.0.0.rc13) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.0) gollum-lib (~> 3.0.0) |