Download as
Browse Code »

Commit cac868ee94cd28792845882f66d75aee6e9c5acd

Authored by Dmitriy Zaporozhets
1 parent b2cab1c5
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

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
@@ -32,7 +32,7 @@ gem &#39;omniauth-github&#39; @@ -32,7 +32,7 @@ gem &#39;omniauth-github&#39;
32 32
33 # Extracting information from a git repository 33 # Extracting information from a git repository
34 # Provide access to Gitlab::Git library 34 # Provide access to Gitlab::Git library
35 -gem "gitlab_git", '~> 5.5.0' 35 +gem "gitlab_git", '~> 5.6.0'
36 36
37 # Ruby/Rack Git Smart-HTTP Server Handler 37 # Ruby/Rack Git Smart-HTTP Server Handler
38 gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' 38 gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
@@ -181,7 +181,7 @@ GEM @@ -181,7 +181,7 @@ GEM
181 charlock_holmes (~> 0.6.6) 181 charlock_holmes (~> 0.6.6)
182 escape_utils (~> 0.2.4) 182 escape_utils (~> 0.2.4)
183 mime-types (~> 1.19) 183 mime-types (~> 1.19)
184 - gitlab_git (5.5.0) 184 + gitlab_git (5.6.0)
185 activesupport (~> 4.0.0) 185 activesupport (~> 4.0.0)
186 charlock_holmes (~> 0.6.9) 186 charlock_holmes (~> 0.6.9)
187 gitlab-grit (~> 2.6.1) 187 gitlab-grit (~> 2.6.1)
@@ -590,7 +590,7 @@ DEPENDENCIES @@ -590,7 +590,7 @@ DEPENDENCIES
590 gitlab-gollum-lib (~> 1.1.0) 590 gitlab-gollum-lib (~> 1.1.0)
591 gitlab-grack (~> 2.0.0.pre) 591 gitlab-grack (~> 2.0.0.pre)
592 gitlab-linguist (~> 3.0.0) 592 gitlab-linguist (~> 3.0.0)
593 - gitlab_git (~> 5.5.0) 593 + gitlab_git (~> 5.6.0)
594 gitlab_meta (= 6.0) 594 gitlab_meta (= 6.0)
595 gitlab_omniauth-ldap (= 1.0.4) 595 gitlab_omniauth-ldap (= 1.0.4)
596 gon (~> 5.0.0) 596 gon (~> 5.0.0)
app/models/tree.rb
  Diff comments   View file @cac868e
@@ -11,7 +11,7 @@ class Tree @@ -11,7 +11,7 @@ class Tree
11 @readme = Gitlab::Git::Blob.find(git_repo, sha, readme_path) 11 @readme = Gitlab::Git::Blob.find(git_repo, sha, readme_path)
12 end 12 end
13 13
14 - if contribution_tree = @entries.find(&:contribution?) 14 + if contribution_tree = @entries.find(&:contributing?)
15 contribution_path = path == '/' ? contribution_tree.name : File.join(path, contribution_tree.name) 15 contribution_path = path == '/' ? contribution_tree.name : File.join(path, contribution_tree.name)
16 @contribution_guide = Gitlab::Git::Blob.find(git_repo, sha, contribution_path) 16 @contribution_guide = Gitlab::Git::Blob.find(git_repo, sha, contribution_path)
17 end 17 end