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

Merge branch 'milestone_and_labels_links' into 'master'
b9372c99 · Dmitriy Zaporozhets · 05fcfe6d · bbf6019d · b9372c99 · b9372c99
Commit b9372c99 authored Mar 25, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 6 deletions

projects_helper.rb app/helpers/projects_helper.rb +1 -1

show.html.haml app/views/projects/milestones/show.html.haml +6 -5

No files found.
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -146,7 +146,7 @@ module ProjectsHelper
      nav_tabs << feature if project.send :"#{feature}_enabled"
    end

-    if project.issues_enabled
+    if project.issues_enabled || project.merge_requests_enabled
      nav_tabs << [:milestones, :labels]
    end


--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -60,11 +60,12 @@
      Participants
      %span.badge= @users.count

-  .pull-right
-    = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { milestone_id: @milestone.id }), class: "btn  btn-grouped", title: "New Issue" do
-      %i.fa.fa-plus
-      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"
+  - if @project.issues_enabled
+    .pull-right
+      = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { milestone_id: @milestone.id }), class: "btn  btn-grouped", title: "New Issue" do
+        %i.fa.fa-plus
+        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-pane.active#tab-issues