diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 15:09:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 15:09:13 +0300 |
commit | 1363ca12f1f07c634647cf55c4c16b7401098673 (patch) | |
tree | d932caf09c8148322edb51ae954ed159ff7d00f8 /app/models/ci | |
parent | 6763d2787670bc03a36a8eb601703e88fc70dece (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/ci')
-rw-r--r-- | app/models/ci/group_variable.rb | 4 | ||||
-rw-r--r-- | app/models/ci/job_variable.rb | 2 | ||||
-rw-r--r-- | app/models/ci/pipeline_schedule_variable.rb | 2 | ||||
-rw-r--r-- | app/models/ci/pipeline_variable.rb | 2 | ||||
-rw-r--r-- | app/models/ci/variable.rb | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/app/models/ci/group_variable.rb b/app/models/ci/group_variable.rb index 0e50265c7ba..1e1dd68ee6c 100644 --- a/app/models/ci/group_variable.rb +++ b/app/models/ci/group_variable.rb @@ -3,9 +3,9 @@ module Ci class GroupVariable < ApplicationRecord extend Gitlab::Ci::Model - include HasVariable + include Ci::HasVariable include Presentable - include Maskable + include Ci::Maskable belongs_to :group, class_name: "::Group" diff --git a/app/models/ci/job_variable.rb b/app/models/ci/job_variable.rb index f2968c037c7..7eea8a37150 100644 --- a/app/models/ci/job_variable.rb +++ b/app/models/ci/job_variable.rb @@ -3,7 +3,7 @@ module Ci class JobVariable < ApplicationRecord extend Gitlab::Ci::Model - include NewHasVariable + include Ci::NewHasVariable include BulkInsertSafe belongs_to :job, class_name: "Ci::Build", foreign_key: :job_id diff --git a/app/models/ci/pipeline_schedule_variable.rb b/app/models/ci/pipeline_schedule_variable.rb index be6e5e76c31..adef9911ae1 100644 --- a/app/models/ci/pipeline_schedule_variable.rb +++ b/app/models/ci/pipeline_schedule_variable.rb @@ -3,7 +3,7 @@ module Ci class PipelineScheduleVariable < ApplicationRecord extend Gitlab::Ci::Model - include HasVariable + include Ci::HasVariable belongs_to :pipeline_schedule diff --git a/app/models/ci/pipeline_variable.rb b/app/models/ci/pipeline_variable.rb index 51a6272e1ff..84ca4833cd7 100644 --- a/app/models/ci/pipeline_variable.rb +++ b/app/models/ci/pipeline_variable.rb @@ -3,7 +3,7 @@ module Ci class PipelineVariable < ApplicationRecord extend Gitlab::Ci::Model - include HasVariable + include Ci::HasVariable belongs_to :pipeline diff --git a/app/models/ci/variable.rb b/app/models/ci/variable.rb index 760872d3e6b..08d39595c61 100644 --- a/app/models/ci/variable.rb +++ b/app/models/ci/variable.rb @@ -3,9 +3,9 @@ module Ci class Variable < ApplicationRecord extend Gitlab::Ci::Model - include HasVariable + include Ci::HasVariable include Presentable - include Maskable + include Ci::Maskable prepend HasEnvironmentScope belongs_to :project |