diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
commit | 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde (patch) | |
tree | dc4d20fe6064752c0bd323187252c77e0a89144b /app/models/ci/bridge.rb | |
parent | 9868dae7fc0655bd7ce4a6887d4e6d487690eeed (diff) |
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42
Diffstat (limited to 'app/models/ci/bridge.rb')
-rw-r--r-- | app/models/ci/bridge.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/models/ci/bridge.rb b/app/models/ci/bridge.rb index 3fda8693a58..323d759510e 100644 --- a/app/models/ci/bridge.rb +++ b/app/models/ci/bridge.rb @@ -75,9 +75,9 @@ module Ci def self.clone_accessors %i[pipeline project ref tag options name - allow_failure stage stage_id stage_idx + allow_failure stage stage_idx yaml_variables when description needs_attributes - scheduling_type].freeze + scheduling_type ci_stage partition_id].freeze end def inherit_status_from_downstream!(pipeline) @@ -183,6 +183,10 @@ module Ci false end + def prevent_rollback_deployment? + false + end + def expanded_environment_name end |