summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-03-11 15:05:51 +0000
committerDouwe Maan <douwe@gitlab.com>2016-03-11 15:05:51 +0000
commitc814421f2a1f1a2fba1acfe178a1f96da5e1e5e4 (patch)
tree33dfa3382a70fe7157bd808e27c500e54f8fd1ca /Gemfile.lock
parent29ac9f64ea6d0a9e5a7615a9597c668dd129f5ae (diff)
parent077d3791952a7120d4f28ca36c600e2185e6c1c5 (diff)
downloadgitlab-ce-c814421f2a1f1a2fba1acfe178a1f96da5e1e5e4.tar.gz
Merge branch 'update-gitlab-git' into 'master'
Updated gitlab_git to 9.0.1 This includes gitlab-org/gitlab_git!69 and will hopefully solve gitlab-org/gitlab-ce#13808. See merge request !3123
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 432bdc344ad..3777528ea4b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -358,7 +358,7 @@ GEM
posix-spawn (~> 0.3)
gitlab_emoji (0.3.1)
gemojione (~> 2.2, >= 2.2.1)
- gitlab_git (9.0.0)
+ gitlab_git (9.0.1)
activesupport (~> 4.0)
charlock_holmes (~> 0.7.3)
github-linguist (~> 4.7.0)