diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-04-17 20:51:12 +0200 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-04-17 20:51:12 +0200 |
commit | 865444f1d80b3e8b114b1aa5418984a8264a8bf1 (patch) | |
tree | 5801349b599c3720f0398c6a5bc058ab4867f5df /Gemfile.lock | |
parent | a66953b16bab5ecf874958d1acb3520ed7490559 (diff) | |
download | gitlab-ce-865444f1d80b3e8b114b1aa5418984a8264a8bf1.tar.gz |
Ignore submodules that are defined in .gitmodules but are checked in as directories.gitlab_git-7.1.10
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 bfe626521e7..360b1abcf56 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -212,7 +212,7 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.1.0) gemojione (~> 2.0) - gitlab_git (7.1.9) + gitlab_git (7.1.10) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) @@ -703,7 +703,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.0.rc2) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.1) - gitlab_git (~> 7.1.9) + gitlab_git (~> 7.1.10) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.1) gollum-lib (~> 4.0.2) |