diff options
author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-02 15:04:50 +0100 |
---|---|---|
committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-02 15:04:50 +0100 |
commit | e08aa3df905f09f1c964fb056cba922a1d6eaa85 (patch) | |
tree | 229c57398707856946b4672701ee5d3d5fcd8dca /Gemfile.lock | |
parent | 0a4db90d36870211df2dc1e606b01602666706c8 (diff) | |
download | gitlab-ce-e08aa3df905f09f1c964fb056cba922a1d6eaa85.tar.gz |
Use gitlab_git 8.0.0
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9aacbced998..211cb9a42ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,14 +1,3 @@ -GIT - remote: https://gitlab.com/gitlab-org/gitlab_git.git - revision: 57160e1cbcf4c03e68aa881dfa8e2f55c37a3ee6 - branch: lazy-blob - specs: - gitlab_git (7.2.24) - activesupport (~> 4.0) - charlock_holmes (~> 0.7.3) - github-linguist (~> 4.7.0) - rugged (~> 0.23.3) - GEM remote: https://rubygems.org/ specs: @@ -350,7 +339,7 @@ GEM json get_process_mem (0.2.0) gherkin-ruby (0.3.2) - github-linguist (4.7.4) + github-linguist (4.7.3) charlock_holmes (~> 0.7.3) escape_utils (~> 1.1.0) mime-types (>= 1.19) @@ -367,6 +356,11 @@ GEM posix-spawn (~> 0.3) gitlab_emoji (0.2.0) gemojione (~> 2.1) + gitlab_git (8.0.0) + activesupport (~> 4.0) + charlock_holmes (~> 0.7.3) + github-linguist (~> 4.7.0) + rugged (~> 0.23.3) gitlab_meta (7.0) gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) @@ -940,7 +934,7 @@ DEPENDENCIES github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) gitlab_emoji (~> 0.2.0) - gitlab_git! + gitlab_git (~> 8.0.0) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.1.0) |