diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-07-07 14:40:41 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-07-07 14:40:41 +0000 |
| commit | 64e589c581589e42dfa1b12a22011f88cd3e62bc (patch) | |
| tree | 8df4fdce797c360d2a6256857db1c02c8b3d52f4 /app/helpers | |
| parent | 86fc4a1f3c8a72ba361d7fa64551c9d1522c255e (diff) | |
| download | gitlab-ce-64e589c581589e42dfa1b12a22011f88cd3e62bc.tar.gz | |
Resolve "Inconsistent location of members page between groups and projects"
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/gitlab_routing_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/projects_helper.rb | 18 | ||||
| -rw-r--r-- | app/helpers/search_helper.rb | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/app/helpers/gitlab_routing_helper.rb b/app/helpers/gitlab_routing_helper.rb index b5f4bbe97dc..2e36d0fdb5a 100644 --- a/app/helpers/gitlab_routing_helper.rb +++ b/app/helpers/gitlab_routing_helper.rb @@ -97,7 +97,7 @@ module GitlabRoutingHelper ## Members def project_members_url(project, *args) - project_project_members_url(project) + project_project_members_url(project, *args) end def project_member_path(project_member, *args) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 5022b291f7f..25969adb649 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -267,15 +267,15 @@ module ProjectsHelper def tab_ability_map { - environments: :read_environment, - milestones: :read_milestone, - snippets: :read_project_snippet, - settings: :admin_project, - builds: :read_build, - labels: :read_label, - issues: :read_issue, - team: :read_project_member, - wiki: :read_wiki + environments: :read_environment, + milestones: :read_milestone, + snippets: :read_project_snippet, + settings: :admin_project, + builds: :read_build, + labels: :read_label, + issues: :read_issue, + project_members: :read_project_member, + wiki: :read_wiki } end diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 8c44f4b0934..fd7ab59ce64 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -75,7 +75,7 @@ module SearchHelper { category: "Current Project", label: "Merge Requests", url: project_merge_requests_path(@project) }, { category: "Current Project", label: "Milestones", url: project_milestones_path(@project) }, { category: "Current Project", label: "Snippets", url: project_snippets_path(@project) }, - { category: "Current Project", label: "Members", url: project_settings_members_path(@project) }, + { category: "Current Project", label: "Members", url: project_project_members_path(@project) }, { category: "Current Project", label: "Wiki", url: project_wikis_path(@project) } ] else |