diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-08-11 15:11:58 +0300 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-08-11 15:11:58 +0300 |
| commit | cf6e58b589713acae3cfeab55bdf1944bbf682a1 (patch) | |
| tree | e2e31e736255915f0fa680ea8f9137fdecb3fcf5 /Gemfile.lock | |
| parent | d9402504adce4d90ca49dbec30c3c5cf3c406247 (diff) | |
| download | gitlab-ce-cf6e58b589713acae3cfeab55bdf1944bbf682a1.tar.gz | |
update gitlab_gitgrit_blame
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d07918bf40c..27535be46ef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,3 @@ -PATH - remote: ../gitlab_git - specs: - gitlab_git (7.2.12) - activesupport (~> 4.0) - charlock_holmes (~> 0.6) - gitlab-linguist (~> 3.0) - rugged (~> 0.22.2) - GEM remote: https://rubygems.org/ specs: @@ -280,6 +271,11 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.1.0) gemojione (~> 2.0) + gitlab_git (7.2.12) + activesupport (~> 4.0) + charlock_holmes (~> 0.6) + gitlab-linguist (~> 3.0) + rugged (~> 0.22.2) gitlab_meta (7.0) gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) @@ -787,7 +783,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.2) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.1) - gitlab_git! + gitlab_git (~> 7.2.12) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.1) gollum-lib (~> 4.0.2) |