diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-01-20 10:05:19 +0000 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2017-01-20 11:19:38 +0100 |
| commit | 89bf4be8abf1482da936239f016aa5005f310db7 (patch) | |
| tree | d2a874f53bf55c0e7356129c384bf3b2be1b73c6 /config | |
| parent | cd094d7a4712b40f254880bef73d0b01c9251845 (diff) | |
| download | gitlab-ce-89bf4be8abf1482da936239f016aa5005f310db7.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 |