Commit cac868ee94cd28792845882f66d75aee6e9c5acd
1 parent
b2cab1c5
Exists in
spb-stable
and in
3 other branches
Use new gitlab_git gem. It makes CONTRIBUTING.md work
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
3 changed files
with
4 additions
and
4 deletions
Show diff stats
Gemfile
| ... | ... | @@ -32,7 +32,7 @@ gem 'omniauth-github' |
| 32 | 32 | |
| 33 | 33 | # Extracting information from a git repository |
| 34 | 34 | # Provide access to Gitlab::Git library |
| 35 | -gem "gitlab_git", '~> 5.5.0' | |
| 35 | +gem "gitlab_git", '~> 5.6.0' | |
| 36 | 36 | |
| 37 | 37 | # Ruby/Rack Git Smart-HTTP Server Handler |
| 38 | 38 | gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' | ... | ... |
Gemfile.lock
| ... | ... | @@ -181,7 +181,7 @@ GEM |
| 181 | 181 | charlock_holmes (~> 0.6.6) |
| 182 | 182 | escape_utils (~> 0.2.4) |
| 183 | 183 | mime-types (~> 1.19) |
| 184 | - gitlab_git (5.5.0) | |
| 184 | + gitlab_git (5.6.0) | |
| 185 | 185 | activesupport (~> 4.0.0) |
| 186 | 186 | charlock_holmes (~> 0.6.9) |
| 187 | 187 | gitlab-grit (~> 2.6.1) |
| ... | ... | @@ -590,7 +590,7 @@ DEPENDENCIES |
| 590 | 590 | gitlab-gollum-lib (~> 1.1.0) |
| 591 | 591 | gitlab-grack (~> 2.0.0.pre) |
| 592 | 592 | gitlab-linguist (~> 3.0.0) |
| 593 | - gitlab_git (~> 5.5.0) | |
| 593 | + gitlab_git (~> 5.6.0) | |
| 594 | 594 | gitlab_meta (= 6.0) |
| 595 | 595 | gitlab_omniauth-ldap (= 1.0.4) |
| 596 | 596 | gon (~> 5.0.0) | ... | ... |
app/models/tree.rb
| ... | ... | @@ -11,7 +11,7 @@ class Tree |
| 11 | 11 | @readme = Gitlab::Git::Blob.find(git_repo, sha, readme_path) |
| 12 | 12 | end |
| 13 | 13 | |
| 14 | - if contribution_tree = @entries.find(&:contribution?) | |
| 14 | + if contribution_tree = @entries.find(&:contributing?) | |
| 15 | 15 | contribution_path = path == '/' ? contribution_tree.name : File.join(path, contribution_tree.name) |
| 16 | 16 | @contribution_guide = Gitlab::Git::Blob.find(git_repo, sha, contribution_path) |
| 17 | 17 | end | ... | ... |