diff options
author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-01 14:00:28 +0100 |
---|---|---|
committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-01 14:00:28 +0100 |
commit | d11d425acc6b6aeaf85113dc9b2aca89b36dfe78 (patch) | |
tree | 72a0983227b492dc5934fd3cd387520d71e10731 | |
parent | 51574d779cac5b97ffb7603db783a26bfd6da1e6 (diff) | |
download | gitlab-ce-d11d425acc6b6aeaf85113dc9b2aca89b36dfe78.tar.gz |
Develop with a custom gitlab_git branch
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 18 |
2 files changed, 13 insertions, 7 deletions
@@ -49,7 +49,7 @@ gem "browser", '~> 1.0.0' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 7.2.23' +gem "gitlab_git", git: 'https://gitlab.com/gitlab-org/gitlab_git.git', branch: 'lazy-blob' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index ec92964df25..d6a5fe9dd0e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,14 @@ +GIT + remote: https://gitlab.com/gitlab-org/gitlab_git.git + revision: dbf224a5d0404ab094e53144b5e01a88b5e9dbaa + 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: @@ -356,11 +367,6 @@ GEM posix-spawn (~> 0.3) gitlab_emoji (0.2.0) gemojione (~> 2.1) - gitlab_git (7.2.24) - 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) @@ -934,7 +940,7 @@ DEPENDENCIES github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) gitlab_emoji (~> 0.2.0) - gitlab_git (~> 7.2.23) + gitlab_git! gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.1.0) |