diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-03-25 09:35:59 +0700 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-03-25 09:35:59 +0700 |
| commit | 8e89ea5ed5b4c01e0ea860bae512720eab22574c (patch) | |
| tree | 7351a1ebf992a976bb025486a6047335e63140f7 | |
| parent | 08491fb1ad7b588db7216a9885153ad65f1b78d8 (diff) | |
| download | gitlab-ce-remove-trigger-variables-related-code.tar.gz | |
Remove trigger variables related coderemove-trigger-variables-related-code
| -rw-r--r-- | app/models/ci/trigger_request.rb | 19 | ||||
| -rw-r--r-- | app/models/concerns/ci/contextable.rb | 1 |
2 files changed, 5 insertions, 15 deletions
diff --git a/app/models/ci/trigger_request.rb b/app/models/ci/trigger_request.rb index 0b52c690e93..3e62ecbbda6 100644 --- a/app/models/ci/trigger_request.rb +++ b/app/models/ci/trigger_request.rb @@ -3,25 +3,16 @@ module Ci class TriggerRequest < ActiveRecord::Base extend Gitlab::Ci::Model + include IgnorableColumn + + # We switched to Ci::PipelineVariable from Ci::TriggerRequest.variables. + # Ci::TriggerRequest doesn't save variables anymore. + ignore_column :variables belongs_to :trigger 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 - - serialize :variables # rubocop:disable Cop/ActiveRecordSerialize - - def user_variables - return [] unless variables - - variables.map do |key, value| - { key: key, value: value, public: false } - end - end end end diff --git a/app/models/concerns/ci/contextable.rb b/app/models/concerns/ci/contextable.rb index 4986a42dbd2..ba0c3ef8279 100644 --- a/app/models/concerns/ci/contextable.rb +++ b/app/models/concerns/ci/contextable.rb @@ -20,7 +20,6 @@ module Ci variables.concat(user_variables) variables.concat(secret_group_variables) variables.concat(secret_project_variables(environment: environment)) - variables.concat(trigger_request.user_variables) if trigger_request variables.concat(pipeline.variables) variables.concat(pipeline.pipeline_schedule.job_variables) if pipeline.pipeline_schedule end |