diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-03-29 21:53:10 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-03-29 21:53:10 +0000 |
| commit | f7fefe82e5e6c72f15e2089816460d704c3ac783 (patch) | |
| tree | 98c78137e56dfa0e7f5470824b8a80425b5105b6 /app/helpers | |
| parent | 3e1fb2a54052ca8a7483e788b70380b5c1768c71 (diff) | |
| parent | 48a30a7ab38932d14dfd4136960983efe76fa630 (diff) | |
| download | gitlab-ce-f7fefe82e5e6c72f15e2089816460d704c3ac783.tar.gz | |
Merge branch '23674-simplify-milestone-summary' into 'master'
Resolve "Simplify milestone summary"
Closes #23674
See merge request !10096
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/milestones_helper.rb | 4 | ||||
| -rw-r--r-- | app/helpers/nav_helper.rb | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb index bd3f51fc658..c9e70faa52e 100644 --- a/app/helpers/milestones_helper.rb +++ b/app/helpers/milestones_helper.rb @@ -19,8 +19,8 @@ module MilestonesHelper end end - def milestones_browse_issuables_path(milestone, type:) - opts = { milestone_title: milestone.title } + def milestones_browse_issuables_path(milestone, state: nil, type:) + opts = { milestone_title: milestone.title, state: state } if @project polymorphic_path([@project.namespace.becomes(Namespace), @project, type], opts) diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index 991fd949b94..17bfd07e00f 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -6,7 +6,8 @@ module NavHelper current_path?('merge_requests#builds') || current_path?('merge_requests#conflicts') || current_path?('merge_requests#pipelines') || - current_path?('issues#show') + current_path?('issues#show') || + current_path?('milestones#show') if cookies[:collapsed_gutter] == 'true' "page-gutter right-sidebar-collapsed" else |