diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-07 17:37:50 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-07 17:37:50 +0300 |
| commit | ee0e3ffc057d9a033dab3fcc9025e71a6e76bc74 (patch) | |
| tree | f326227fa14deacbdd323378d58bd2f6ef86f6d0 /config/routes | |
| parent | d030393adb414a9264623f403d2b6f39adcf3b4e (diff) | |
| parent | 3d70eeb5bb9dac8073a149547dc3b85c90d65e7d (diff) | |
Merge branch '3191-deploy-keys-update' into 'master'
Implement ability to update deploy keys
Closes #3191
See merge request !10383
Diffstat (limited to 'config/routes')
| -rw-r--r-- | config/routes/admin.rb | 2 | ||||
| -rw-r--r-- | config/routes/project.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb index c7b639b7b3c..5427bab93ce 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -48,7 +48,7 @@ namespace :admin do end end - resources :deploy_keys, only: [:index, :new, :create, :destroy] + resources :deploy_keys, only: [:index, :new, :create, :edit, :update, :destroy] resources :hooks, only: [:index, :create, :edit, :update, :destroy] do member do diff --git a/config/routes/project.rb b/config/routes/project.rb index 14718e2f3c4..f95cc3101d3 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -73,7 +73,7 @@ constraints(ProjectUrlConstrainer.new) do resource :mattermost, only: [:new, :create] - resources :deploy_keys, constraints: { id: /\d+/ }, only: [:index, :new, :create] do + resources :deploy_keys, constraints: { id: /\d+/ }, only: [:index, :new, :create, :edit, :update] do member do put :enable put :disable |