summaryrefslogtreecommitdiff
path: root/app/models/ci
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-09-05 09:49:55 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2017-09-05 09:49:55 +0000
commit3d61421fb2ed22d64a6b20701d600a38db1458f5 (patch)
tree09865dc5eb46f29b7ee43d3c6918c814caedbec1 /app/models/ci
parent89efaf2aa2d65ae41ce5502059d40fa068be945f (diff)
parent48f017d1e84498eec38d276d94918021a985bfee (diff)
downloadgitlab-ce-3d61421fb2ed22d64a6b20701d600a38db1458f5.tar.gz
Merge branch 'fix/sm/35650-remove-createtriggerrequestservice-and-forbid-to-persist-variables-on-ci-triggerrequest' into 'master'
Removes `CreateTriggerRequestService` and add a blocker to prevent saving variables on `Ci::TriggerRequest` Closes #35650 See merge request !13792
Diffstat (limited to 'app/models/ci')
-rw-r--r--app/models/ci/trigger_request.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/ci/trigger_request.rb b/app/models/ci/trigger_request.rb
index c58ce5c3717..2c860598281 100644
--- a/app/models/ci/trigger_request.rb
+++ b/app/models/ci/trigger_request.rb
@@ -6,6 +6,10 @@ module Ci
belongs_to :pipeline, foreign_key: :commit_id
has_many :builds
+ # We switched to Ci::PipelineVariable from Ci::TriggerRequest.variables.
+ # Ci::TriggerRequest doesn't save variables anymore.
+ validates :variables, absence: true
+
serialize :variables # rubocop:disable Cop/ActiveRecordSerialize
def user_variables