summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorArif Ali <mail@arif-ali.co.uk>2014-12-30 20:50:08 +0000
committerArif Ali <mail@arif-ali.co.uk>2014-12-30 21:59:38 +0000
commit1d8dcfaf8be8679556e1602d0061fc5cdd828845 (patch)
treebbf17080469c9d815908c8e280c717f9faf1edef /Gemfile.lock
parent884352294deab0c11845547ce2ab96b60f468458 (diff)
downloadgitlab-ce-1d8dcfaf8be8679556e1602d0061fc5cdd828845.tar.gz
fix deleted file display when using new gitlab_git gem, and add new gitlab_git gem
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 554223b83c9..55861ae53ce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -183,7 +183,7 @@ GEM
mime-types (~> 1.19)
gitlab_emoji (0.0.1.1)
emoji (~> 1.0.1)
- gitlab_git (7.0.0.rc12)
+ gitlab_git (7.0.0.rc13)
activesupport (~> 4.0)
charlock_holmes (~> 0.6)
gitlab-linguist (~> 3.0)
@@ -643,7 +643,7 @@ DEPENDENCIES
gitlab-grack (~> 2.0.0.pre)
gitlab-linguist (~> 3.0.0)
gitlab_emoji (~> 0.0.1.1)
- gitlab_git (= 7.0.0.rc12)
+ gitlab_git (= 7.0.0.rc13)
gitlab_meta (= 7.0)
gitlab_omniauth-ldap (= 1.2.0)
gollum-lib (~> 3.0.0)