summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-08-27 13:07:14 -0700
committerStan Hu <stanhu@gmail.com>2015-08-27 13:08:15 -0700
commitef6c06c0f3341d9508693930af4979659d6a4b63 (patch)
treed043784ff945e8c40cd4631c5295a3ebed389da6 /Gemfile.lock
parent10ee826847f956a235952fbb41d5ba589927b862 (diff)
downloadgitlab-ce-ef6c06c0f3341d9508693930af4979659d6a4b63.tar.gz
Upgrade gitlab_git to 7.2.15 to fix `git blame` errors with ISO-encoded files
Closes https://github.com/gitlabhq/gitlabhq/issues/9577
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 814249c7ff6..ff01ad10145 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -276,7 +276,7 @@ GEM
mime-types (~> 1.19)
gitlab_emoji (0.1.0)
gemojione (~> 2.0)
- gitlab_git (7.2.14)
+ gitlab_git (7.2.15)
activesupport (~> 4.0)
charlock_holmes (~> 0.6)
gitlab-linguist (~> 3.0)
@@ -790,7 +790,7 @@ DEPENDENCIES
gitlab-grack (~> 2.0.2)
gitlab-linguist (~> 3.0.1)
gitlab_emoji (~> 0.1)
- gitlab_git (~> 7.2.14)
+ gitlab_git (~> 7.2.15)
gitlab_meta (= 7.0)
gitlab_omniauth-ldap (= 1.2.1)
gollum-lib (~> 4.0.2)