diff options
author | Nick Thomas <nick@gitlab.com> | 2018-02-28 15:19:19 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2018-02-28 15:19:19 +0000 |
commit | 01b8d4bdda9568d458e3c0c94c5fcbc2c49b7b71 (patch) | |
tree | 019504dbb100bbb8d41fbb1a4ecb6f37f9182bbd /config | |
parent | 2e48bf116c4e307f125b3bbaf0c754574c4eb22c (diff) | |
parent | e9ece462b9dbe5c403f6d3d7043781ce83df3fdc (diff) | |
download | gitlab-ce-01b8d4bdda9568d458e3c0c94c5fcbc2c49b7b71.tar.gz |
Merge branch 'feature/edit_pages_domain' into 'master'
PagesDomain: allow update of key/certificate
Closes #29720
See merge request gitlab-org/gitlab-ce!17376
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 dd1a9c3be3b..34636285c51 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -55,7 +55,7 @@ constraints(ProjectUrlConstrainer.new) do end resource :pages, only: [:show, :destroy] do - resources :domains, only: [:show, :new, :create, :destroy], controller: 'pages_domains', constraints: { id: %r{[^/]+} } do + resources :domains, except: :index, controller: 'pages_domains', constraints: { id: %r{[^/]+} } do member do post :verify end |