diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-01-02 21:17:16 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-01-02 21:17:16 +0000 |
| commit | a4833f6fe0b725a4ee312367a311ec075352fba2 (patch) | |
| tree | c256680bd3dccff2c8407cfda57c96b07c760136 /app/helpers/milestones_helper.rb | |
| parent | 2d7c3dbf5c768ecddff9b6c1c897357ab2b923ff (diff) | |
| parent | e9ef02096be859e31c155174fe2784d8a7ba73e3 (diff) | |
| download | gitlab-ce-a4833f6fe0b725a4ee312367a311ec075352fba2.tar.gz | |
Merge branch 'ccr/49289_milestone_link' into 'master'
Add project milestone link
Closes #49289
See merge request gitlab-org/gitlab-ce!22552
Diffstat (limited to 'app/helpers/milestones_helper.rb')
| -rw-r--r-- | app/helpers/milestones_helper.rb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb index 327b69e5110..50aec83b867 100644 --- a/app/helpers/milestones_helper.rb +++ b/app/helpers/milestones_helper.rb @@ -231,12 +231,15 @@ module MilestonesHelper end end - def group_or_dashboard_milestone_path(milestone) - if milestone.group_milestone? - group_milestone_path(milestone.group, milestone.iid, milestone: { title: milestone.title }) - else - dashboard_milestone_path(milestone.safe_title, title: milestone.title) - end + def group_or_project_milestone_path(milestone) + params = + if milestone.group_milestone? + { milestone: { title: milestone.title } } + else + { title: milestone.title } + end + + milestone_path(milestone.milestone, params) end def can_admin_project_milestones? |