diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-28 11:18:08 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-02-02 17:47:18 -0500 |
| commit | 0a08b105801dd9eb0c32e2619a905650e7fe46e5 (patch) | |
| tree | 30f547026bbdcbbf880a00b0d9693bc8d2526d59 | |
| parent | d151b3878877b74f2493015d8da7812448da1b41 (diff) | |
| download | gitlab-ce-0a08b105801dd9eb0c32e2619a905650e7fe46e5.tar.gz | |
Add link to open/closed issues plus some minor updates.
| -rw-r--r-- | app/views/projects/milestones/_merge_requests.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/milestones/show.html.haml | 25 |
2 files changed, 9 insertions, 17 deletions
diff --git a/app/views/projects/milestones/_merge_requests.html.haml b/app/views/projects/milestones/_merge_requests.html.haml index 00889a5eb24..9a5a02af215 100644 --- a/app/views/projects/milestones/_merge_requests.html.haml +++ b/app/views/projects/milestones/_merge_requests.html.haml @@ -3,4 +3,3 @@ %ul{ class: "well-list merge_requests-sortable-list", id: "merge_requests-list-#{id}", "data-state" => id } - merge_requests.sort_by(&:position).each do |merge_request| = render 'merge_request', merge_request: merge_request - %li.light.ui-sort-disabled Drag and drop available diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index afdf18a14c9..72506e6ecf7 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -120,9 +120,6 @@ = render 'merge_request', merge_request: merge_request .tab-pane#tab-participants - .content-block.oneline-block - All participants to this milestone - %ul.bordered-list - @users.each do |user| %li @@ -133,20 +130,16 @@ %small.cgray= user.username .tab-pane#tab-labels - .gray-content-block.middle-block - .pull-right - - if can?(current_user, :create_issue, @project) - = 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 - - if can?(current_user, :read_issue, @project) - = link_to 'Browse Issues', namespace_project_issues_path(@milestone.project.namespace, @milestone.project, milestone_title: @milestone.title), class: "btn btn-grouped" - - .oneline - All labels in this milestone %ul.bordered-list.manage-labels-list - @labels.each do |label| %li = render_colored_label(label) - %span.issues-count= pluralize label.open_issues_count, 'open issue' - %span.issues-count= pluralize label.closed_issues_count, 'closed issue' + - args = [@milestone.project.namespace, @milestone.project, milestone_title: @milestone.title, label_name: label.title] + - options = args.extract_options! + + %span.issues-count + = link_to namespace_project_issues_path(*args, options.merge(state: 'opened')) do + = pluralize label.open_issues_count, 'open issue' + %span.issues-count + = link_to namespace_project_issues_path(*args, options.merge(state: 'closed')) do + = pluralize label.closed_issues_count, 'closed issue' |