diff options
| author | Felipe Artur <felipefac@gmail.com> | 2017-06-08 16:55:50 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-06-16 12:01:41 -0300 |
| commit | 673bc07c0f6cb936fbc2037440634133ad32afaf (patch) | |
| tree | 48c625891376898e1bc9389064ae49ff3cb1309f /app/views | |
| parent | 86fc145c3c0c5056d7c6be1d62cd0b5beec2b1a9 (diff) | |
| download | gitlab-ce-673bc07c0f6cb936fbc2037440634133ad32afaf.tar.gz | |
Order merge requests by priority
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/shared/milestones/_tabs.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/milestones/_top.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/shared/milestones/_tabs.html.haml b/app/views/shared/milestones/_tabs.html.haml index b18f903bc1f..b1d24578daf 100644 --- a/app/views/shared/milestones/_tabs.html.haml +++ b/app/views/shared/milestones/_tabs.html.haml @@ -32,11 +32,11 @@ - if milestone.is_a?(GlobalMilestone) || can?(current_user, :read_issue, @project) .tab-pane.active#tab-issues{ data: { sort_endpoint: (sort_issues_namespace_project_milestone_path(@project.namespace, @project, @milestone) if @project && current_user) } } = render 'shared/milestones/issues_tab', issues: milestone.issues_visible_to_user(current_user).preload_associations, show_project_name: show_project_name, show_full_project_name: show_full_project_name - .tab-pane#tab-merge-requests{ data: { sort_endpoint: (sort_merge_requests_namespace_project_milestone_path(@project.namespace, @project, @milestone) if @project && current_user) } } + .tab-pane#tab-merge-requests -# loaded async = render "shared/milestones/tab_loading" - else - .tab-pane.active#tab-merge-requests{ data: { sort_endpoint: (sort_merge_requests_namespace_project_milestone_path(@project.namespace, @project, @milestone) if @project && current_user) } } + .tab-pane.active#tab-merge-requests -# loaded async = render "shared/milestones/tab_loading" .tab-pane#tab-participants diff --git a/app/views/shared/milestones/_top.html.haml b/app/views/shared/milestones/_top.html.haml index 2562f085338..36c2969a555 100644 --- a/app/views/shared/milestones/_top.html.haml +++ b/app/views/shared/milestones/_top.html.haml @@ -50,7 +50,7 @@ - project_name = group ? ms.project.name : ms.project.name_with_namespace = link_to project_name, namespace_project_milestone_path(ms.project.namespace, ms.project, ms) %td - = ms.issues_visible_to_user(current_user).opened.count + = ms.issues_visible_to_user(current_user).opened.length %td - if ms.closed? Closed |