diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-27 15:52:14 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-27 15:52:14 +0200 |
commit | cac868ee94cd28792845882f66d75aee6e9c5acd (patch) | |
tree | c131f105fc404a87f869058815ecf37c2ab014de | |
parent | b2cab1c52ad32166c49903d00f25c305aa225ddb (diff) | |
download | gitlab-ce-cac868ee94cd28792845882f66d75aee6e9c5acd.tar.gz |
Use new gitlab_git gem. It makes CONTRIBUTING.md work
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 4 | ||||
-rw-r--r-- | app/models/tree.rb | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -32,7 +32,7 @@ gem 'omniauth-github' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 5.5.0' +gem "gitlab_git", '~> 5.6.0' # Ruby/Rack Git Smart-HTTP Server Handler gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' diff --git a/Gemfile.lock b/Gemfile.lock index 2cf0929fe79..0b0e2aa7360 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -181,7 +181,7 @@ GEM charlock_holmes (~> 0.6.6) escape_utils (~> 0.2.4) mime-types (~> 1.19) - gitlab_git (5.5.0) + gitlab_git (5.6.0) activesupport (~> 4.0.0) charlock_holmes (~> 0.6.9) gitlab-grit (~> 2.6.1) @@ -590,7 +590,7 @@ DEPENDENCIES gitlab-gollum-lib (~> 1.1.0) gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 3.0.0) - gitlab_git (~> 5.5.0) + gitlab_git (~> 5.6.0) gitlab_meta (= 6.0) gitlab_omniauth-ldap (= 1.0.4) gon (~> 5.0.0) diff --git a/app/models/tree.rb b/app/models/tree.rb index f1077772ea9..ac2183be44b 100644 --- a/app/models/tree.rb +++ b/app/models/tree.rb @@ -11,7 +11,7 @@ class Tree @readme = Gitlab::Git::Blob.find(git_repo, sha, readme_path) end - if contribution_tree = @entries.find(&:contribution?) + if contribution_tree = @entries.find(&:contributing?) contribution_path = path == '/' ? contribution_tree.name : File.join(path, contribution_tree.name) @contribution_guide = Gitlab::Git::Blob.find(git_repo, sha, contribution_path) end |