Added the contribution guide notice
This is shown at the creation of new issues and new merge requests, when the repository has a contribution guide file.
This commit is contained in:
parent
4e0a2e3c96
commit
bb35c2d36f
|
@ -134,6 +134,7 @@ class Repository
|
||||||
Rails.cache.delete(cache_key(:commit_count))
|
Rails.cache.delete(cache_key(:commit_count))
|
||||||
Rails.cache.delete(cache_key(:graph_log))
|
Rails.cache.delete(cache_key(:graph_log))
|
||||||
Rails.cache.delete(cache_key(:readme))
|
Rails.cache.delete(cache_key(:readme))
|
||||||
|
Rails.cache.delete(cache_key(:contribution_guide))
|
||||||
end
|
end
|
||||||
|
|
||||||
def graph_log
|
def graph_log
|
||||||
|
@ -167,6 +168,12 @@ class Repository
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def contribution_guide
|
||||||
|
Rails.cache.fetch(cache_key(:contribution_guide)) do
|
||||||
|
tree(:head).contribution_guide
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def head_commit
|
def head_commit
|
||||||
commit(self.root_ref)
|
commit(self.root_ref)
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
class Tree
|
class Tree
|
||||||
attr_accessor :entries, :readme
|
attr_accessor :entries, :readme, :contribution_guide
|
||||||
|
|
||||||
def initialize(repository, sha, path = '/')
|
def initialize(repository, sha, path = '/')
|
||||||
path = '/' if path.blank?
|
path = '/' if path.blank?
|
||||||
|
@ -10,6 +10,11 @@ class Tree
|
||||||
readme_path = path == '/' ? readme_tree.name : File.join(path, readme_tree.name)
|
readme_path = path == '/' ? readme_tree.name : File.join(path, readme_tree.name)
|
||||||
@readme = Gitlab::Git::Blob.find(git_repo, sha, readme_path)
|
@readme = Gitlab::Git::Blob.find(git_repo, sha, readme_path)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if contribution_tree = @entries.find(&:contribution?)
|
||||||
|
contribution_path = path == '/' ? contribution_tree.name : File.join(path, contribution_tree.name)
|
||||||
|
@contribution_guide = Gitlab::Git::Blob.find(git_repo, sha, contribution_path)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def trees
|
def trees
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
%div.issue-form-holder
|
%div.issue-form-holder
|
||||||
%h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.iid}"
|
%h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.iid}"
|
||||||
%hr
|
%hr
|
||||||
|
- if @repository.contribution_guide && !@issue.persisted?
|
||||||
|
- contribution_guide_url = project_blob_path(@project, tree_join(@repository.root_ref, @repository.contribution_guide.name))
|
||||||
|
.alert.alert-info.col-sm-10.col-sm-offset-2
|
||||||
|
="Please review the <strong>#{link_to "guidelines for contribution", contribution_guide_url}</strong> to this repository.".html_safe
|
||||||
= form_for [@project, @issue], html: { class: 'form-horizontal issue-form' } do |f|
|
= form_for [@project, @issue], html: { class: 'form-horizontal issue-form' } do |f|
|
||||||
-if @issue.errors.any?
|
-if @issue.errors.any?
|
||||||
.alert.alert-danger
|
.alert.alert-danger
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
|
- if @repository.contribution_guide && !@merge_request.persisted?
|
||||||
|
- contribution_guide_url = project_blob_path(@project, tree_join(@repository.root_ref, @repository.contribution_guide.name))
|
||||||
|
.alert.alert-info.col-sm-10.col-sm-offset-2
|
||||||
|
="Please review the <strong>#{link_to "guidelines for contribution", contribution_guide_url}</strong> to this repository.".html_safe
|
||||||
= form_for [@project, @merge_request], html: { class: "merge-request-form form-horizontal" } do |f|
|
= form_for [@project, @merge_request], html: { class: "merge-request-form form-horizontal" } do |f|
|
||||||
-if @merge_request.errors.any?
|
-if @merge_request.errors.any?
|
||||||
.alert.alert-danger
|
.alert.alert-danger
|
||||||
|
|
Loading…
Reference in New Issue