diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-24 16:51:14 +0000 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-24 16:51:14 +0000 |
commit | 5265942b751f41022393df2f52bc8e005d1ca168 (patch) | |
tree | 724aa6b7995a81cbbf189bae11a5f95f8af7f60e /lib/api/triggers.rb | |
parent | 426716d1556f821988e67cc178e4ecffc4115897 (diff) | |
download | gitlab-ce-11-4-stable.tar.gz |
Revert "Merge branch 'security-pipeline-trigger-tokens-exposure-11-4' into 'security-11-4'"11-4-stable
This reverts commit 426716d1556f821988e67cc178e4ecffc4115897
Diffstat (limited to 'lib/api/triggers.rb')
-rw-r--r-- | lib/api/triggers.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/api/triggers.rb b/lib/api/triggers.rb index f3a0d7b7b43..f784c857883 100644 --- a/lib/api/triggers.rb +++ b/lib/api/triggers.rb @@ -51,7 +51,7 @@ module API triggers = user_project.triggers.includes(:trigger_requests) - present paginate(triggers), with: Entities::Trigger, current_user: current_user + present paginate(triggers), with: Entities::Trigger end # rubocop: enable CodeReuse/ActiveRecord @@ -68,7 +68,7 @@ module API trigger = user_project.triggers.find(params.delete(:trigger_id)) break not_found!('Trigger') unless trigger - present trigger, with: Entities::Trigger, current_user: current_user + present trigger, with: Entities::Trigger end desc 'Create a trigger' do @@ -85,7 +85,7 @@ module API declared_params(include_missing: false).merge(owner: current_user)) if trigger.valid? - present trigger, with: Entities::Trigger, current_user: current_user + present trigger, with: Entities::Trigger else render_validation_error!(trigger) end @@ -106,7 +106,7 @@ module API break not_found!('Trigger') unless trigger if trigger.update(declared_params(include_missing: false)) - present trigger, with: Entities::Trigger, current_user: current_user + present trigger, with: Entities::Trigger else render_validation_error!(trigger) end @@ -127,7 +127,7 @@ module API if trigger.update(owner: current_user) status :ok - present trigger, with: Entities::Trigger, current_user: current_user + present trigger, with: Entities::Trigger else render_validation_error!(trigger) end |