summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-03-31 12:34:07 +0200
committerDouwe Maan <douwe@gitlab.com>2015-03-31 12:37:14 +0200
commit5ad0eb4378ce3da98fed210c0383687900e9414a (patch)
treeb2654112b2aed303e11a8032b439675b12ad8392 /Gemfile.lock
parent08eac512bdcd9181476afc3e4bc0b132ebd48478 (diff)
downloadgitlab-ce-5ad0eb4378ce3da98fed210c0383687900e9414a.tar.gz
Update gitlab_git to 7.1.5, to fix final line in EmailsOnPush email diff being rendered as error.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index ed8663b358b..bc278a0e73c 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.3)
+ gitlab_git (7.1.5)
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.3)
+ gitlab_git (~> 7.1.5)
gitlab_meta (= 7.0)
gitlab_omniauth-ldap (= 1.2.1)
gollum-lib (~> 4.0.2)