diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-25 01:02:34 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-25 01:02:34 +0000 |
| commit | b9372c999707558b695fa401b4f660a3d38fce86 (patch) | |
| tree | 1bb2c705dc7ec4254a3f93fee26c4bcc57db9e71 | |
| parent | 05fcfe6daf5216f7eafaadc4072f224b64d5d581 (diff) | |
| parent | bbf6019dd87fcf95c584addc253bf8333809f4c8 (diff) | |
| download | gitlab-ce-b9372c999707558b695fa401b4f660a3d38fce86.tar.gz | |
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
| -rw-r--r-- | app/helpers/projects_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/milestones/show.html.haml | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 77ad7a40fab..7bf51b5b8e8 100644 --- 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 diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index 110d8967342..25cc0030965 100644 --- 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 |