Merge branch 'milestone_and_labels_links' into 'master'
Milestones and labels can be used even when issues are disabled. When Issues are disabled for a project Milestones and Labels can still be used for Merge Requests. See merge request !1739
This commit is contained in:
commit
b9372c9997
|
@ -146,7 +146,7 @@ module ProjectsHelper
|
||||||
nav_tabs << feature if project.send :"#{feature}_enabled"
|
nav_tabs << feature if project.send :"#{feature}_enabled"
|
||||||
end
|
end
|
||||||
|
|
||||||
if project.issues_enabled
|
if project.issues_enabled || project.merge_requests_enabled
|
||||||
nav_tabs << [:milestones, :labels]
|
nav_tabs << [:milestones, :labels]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -60,11 +60,12 @@
|
||||||
Participants
|
Participants
|
||||||
%span.badge= @users.count
|
%span.badge= @users.count
|
||||||
|
|
||||||
.pull-right
|
- if @project.issues_enabled
|
||||||
= link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { milestone_id: @milestone.id }), class: "btn btn-grouped", title: "New Issue" do
|
.pull-right
|
||||||
%i.fa.fa-plus
|
= link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { milestone_id: @milestone.id }), class: "btn btn-grouped", title: "New Issue" do
|
||||||
New Issue
|
%i.fa.fa-plus
|
||||||
= link_to 'Browse Issues', namespace_project_issues_path(@milestone.project.namespace, @milestone.project, milestone_id: @milestone.id), class: "btn edit-milestone-link btn-grouped"
|
New Issue
|
||||||
|
= link_to 'Browse Issues', namespace_project_issues_path(@milestone.project.namespace, @milestone.project, milestone_id: @milestone.id), class: "btn edit-milestone-link btn-grouped"
|
||||||
|
|
||||||
.tab-content
|
.tab-content
|
||||||
.tab-pane.active#tab-issues
|
.tab-pane.active#tab-issues
|
||||||
|
|
Loading…
Reference in New Issue