diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-01-20 10:05:19 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-01-20 10:05:19 +0000 |
| commit | 34ef6ce3d3dc46ffc2b34f5882ddf2a2454ec7b6 (patch) | |
| tree | 348f0e305df7fa8483969c231408932765d2959d /config | |
| parent | 5a41d92b9d73cbc41b649239e40a15955094f77e (diff) | |
| parent | 8f391fd373a3789b021d07bb23dc837e91c65da2 (diff) | |
| download | gitlab-ce-34ef6ce3d3dc46ffc2b34f5882ddf2a2454ec7b6.tar.gz | |
Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master'
Moved the webhooks and services gear options to a single one called integrations
See merge request !8380
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 1fc6ed28c74..6620b765e02 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -307,9 +307,9 @@ constraints(ProjectUrlConstrainer.new) do end end end - namespace :settings do resource :members, only: [:show] + resource :integrations, only: [:show] end # Since both wiki and repository routing contains wildcard characters |