summaryrefslogtreecommitdiff
path: root/app/models/ci/trigger_request.rb
diff options
context:
space:
mode:
authorSteve Azzopardi <steveazz@outlook.com>2018-09-04 09:51:00 +0200
committerSteve Azzopardi <steveazz@outlook.com>2018-09-12 11:00:39 +0200
commit1b388c798b01d950ad8692e34938a2a457c6ad0f (patch)
tree96471170bf1da744b6c043212a78c09df768a17d /app/models/ci/trigger_request.rb
parentf87809f78de9da04f38134ba5ce0cf9ddebf2f63 (diff)
downloadgitlab-ce-1b388c798b01d950ad8692e34938a2a457c6ad0f.tar.gz
Add trigger information for job API
Create new entity called TriggerVariablesEnitity for trigger variables, to aid reuseablity in the future. Update JSON schema to include trigger information in the response. Refactor rspec tests a bit to reduce duplication and for the `context` to make sense. closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50989
Diffstat (limited to 'app/models/ci/trigger_request.rb')
-rw-r--r--app/models/ci/trigger_request.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/ci/trigger_request.rb b/app/models/ci/trigger_request.rb
index 913936a0bcb..0b52c690e93 100644
--- a/app/models/ci/trigger_request.rb
+++ b/app/models/ci/trigger_request.rb
@@ -8,6 +8,8 @@ module Ci
belongs_to :pipeline, foreign_key: :commit_id
has_many :builds
+ delegate :short_token, to: :trigger, prefix: true, allow_nil: true
+
# We switched to Ci::PipelineVariable from Ci::TriggerRequest.variables.
# Ci::TriggerRequest doesn't save variables anymore.
validates :variables, absence: true