diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-08-11 09:16:11 +0300 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-08-11 09:16:11 +0300 |
| commit | d9402504adce4d90ca49dbec30c3c5cf3c406247 (patch) | |
| tree | 038cb5e690a723209b8c6f17b0949b7778315daa | |
| parent | 5bdcdf56168026134282b1434e716bcf35beaa2c (diff) | |
| download | gitlab-ce-d9402504adce4d90ca49dbec30c3c5cf3c406247.tar.gz | |
link to the local gitlab_git
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 18 |
2 files changed, 12 insertions, 8 deletions
@@ -38,7 +38,7 @@ gem "browser", '~> 0.8.0' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 7.2.11' +gem "gitlab_git", path: "../gitlab_git" # Ruby/Rack Git Smart-HTTP Server Handler # GitLab fork with a lot of changes (improved thread-safety, better memory usage etc) diff --git a/Gemfile.lock b/Gemfile.lock index 5ba6948cbc1..d07918bf40c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,12 @@ +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: @@ -271,11 +280,6 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.1.0) gemojione (~> 2.0) - gitlab_git (7.2.11) - 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) @@ -783,7 +787,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.2) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.1) - gitlab_git (~> 7.2.11) + gitlab_git! gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.1) gollum-lib (~> 4.0.2) @@ -875,4 +879,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.10.4 + 1.10.5 |