summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2017-01-06 20:17:34 +0000
committerAlfredo Sumaran <alfredo@gitlab.com>2017-01-06 20:17:34 +0000
commit9cdfcbb50f225162fd46162e13e5b685819c9543 (patch)
tree2943337651dfe6daa880445954af2a83e1c7bc1a /config
parentf77f736ba40c6ba967531592ec48dd3e2cec1ebc (diff)
parent23e6d8c3682c116db909d0eabfaedb57df85bf36 (diff)
downloadgitlab-ce-9cdfcbb50f225162fd46162e13e5b685819c9543.tar.gz
Merge branch '25985-combine-members-and-groups-settings-pages' into 'master'
Moved the members and groups to single option called members Closes #25985 See merge request !8281
Diffstat (limited to 'config')
-rw-r--r--config/routes/project.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 4d20acbef7a..26e2dc9e6e7 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -307,6 +307,10 @@ constraints(ProjectUrlConstrainer.new) do
end
end
+ namespace :settings do
+ resource :members, only: [:show]
+ end
+
# Since both wiki and repository routing contains wildcard characters
# its preferable to keep it below all other project routes
draw :wiki