summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-07-26 13:41:02 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-07-26 13:41:02 +0000
commit890c1421a4b28cdc65427235cd5a397c5d1be9c4 (patch)
tree8cbe6c6850d90fe563ca44168adb01f958c04c4b /config
parent3a178b26107d99377347664ce4cb7e5bcb0dc854 (diff)
parenta7821dd910fd385a66cfe6c840c37c7b11263410 (diff)
downloadgitlab-ce-890c1421a4b28cdc65427235cd5a397c5d1be9c4.tar.gz
Merge branch 'security-remove-take-trigger-ownership-feature' into 'master'
Drop feature to take ownership of a trigger token Closes #2868 See merge request gitlab/gitlabhq!3198
Diffstat (limited to 'config')
-rw-r--r--config/routes/project.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb
index c202463dadb..1f632765317 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -339,11 +339,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
resource :variables, only: [:show, :update]
- resources :triggers, only: [:index, :create, :edit, :update, :destroy] do
- member do
- post :take_ownership
- end
- end
+ resources :triggers, only: [:index, :create, :edit, :update, :destroy]
resource :mirror, only: [:show, :update] do
member do