summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-08 14:19:52 +0000
committerDouwe Maan <douwe@gitlab.com>2015-12-08 14:19:52 +0000
commit51ed5225adf4aac3ccbf715f8647258dac784abb (patch)
tree16137752ed3ea1ffd8c5398ceb131868dc2105d1 /Gemfile.lock
parentf5430e48b42227f1c1874ca27c6907f0f704be28 (diff)
parent6245be083d985df3dd5daebb78ecf300bacff7b6 (diff)
downloadgitlab-ce-51ed5225adf4aac3ccbf715f8647258dac784abb.tar.gz
Merge branch 'serve_lfs_object' into 'master'
Serve LFS object Depends on gitlab-org/gitlab_git!57 See merge request !1976
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 5d70788d981..ce1d1fd3d17 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -314,7 +314,7 @@ GEM
posix-spawn (~> 0.3)
gitlab_emoji (0.2.0)
gemojione (~> 2.1)
- gitlab_git (7.2.20)
+ gitlab_git (7.2.21)
activesupport (~> 4.0)
charlock_holmes (~> 0.7.3)
github-linguist (~> 4.7.0)