diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-12-19 17:51:02 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-31 18:51:17 +0300 |
| commit | 7327fb4aa7239024970a063b4a68ccdeed0e545e (patch) | |
| tree | a760f466d3b2a057f8d475a6e6ce05cecea1c1cd | |
| parent | 084b7edb17d25a3d43526cca560569dd82c5c09d (diff) | |
Present all pipeline triggers using trigger presenter
| -rw-r--r-- | app/controllers/projects/settings/ci_cd_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/ci/trigger.rb | 2 | ||||
| -rw-r--r-- | lib/api/triggers.rb | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb index 75e590f3f33..f2f63e986bb 100644 --- a/app/controllers/projects/settings/ci_cd_controller.rb +++ b/app/controllers/projects/settings/ci_cd_controller.rb @@ -99,7 +99,9 @@ module Projects def define_triggers_variables @triggers = @project.triggers + .present(current_user: current_user) @trigger = ::Ci::Trigger.new + .present(current_user: current_user) end def define_badges_variables diff --git a/app/models/ci/trigger.rb b/app/models/ci/trigger.rb index 3a9cdfcc35e..637148c4ce4 100644 --- a/app/models/ci/trigger.rb +++ b/app/models/ci/trigger.rb @@ -30,7 +30,7 @@ module Ci end def short_token - token[0...4] + token[0...4] if token.present? end def legacy? diff --git a/lib/api/triggers.rb b/lib/api/triggers.rb index 26255aecef6..8fc7c7361e1 100644 --- a/lib/api/triggers.rb +++ b/lib/api/triggers.rb @@ -85,7 +85,7 @@ module API declared_params(include_missing: false).merge(owner: current_user)) if trigger.valid? - present trigger, with: Entities::Trigger + present trigger, with: Entities::Trigger, current_user: current_user 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 + present trigger, with: Entities::Trigger, current_user: current_user 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 + present trigger, with: Entities::Trigger, current_user: current_user else render_validation_error!(trigger) end |