Revert set_protected
This commit is contained in:
parent
4b8c52f2fc
commit
c4c383e6d5
4 changed files with 12 additions and 12 deletions
|
@ -27,6 +27,7 @@ module Ci
|
|||
|
||||
validates :coverage, numericality: true, allow_blank: true
|
||||
validates :ref, presence: true
|
||||
validates :protected, inclusion: { in: [true, false], unless: :importing? }, on: :create
|
||||
|
||||
scope :unstarted, ->() { where(runner_id: nil) }
|
||||
scope :ignore_failures, ->() { where(allow_failure: false) }
|
||||
|
@ -46,7 +47,6 @@ module Ci
|
|||
|
||||
before_save :update_artifacts_size, if: :artifacts_file_changed?
|
||||
before_save :ensure_token
|
||||
before_save :set_protected
|
||||
before_destroy { unscoped_project }
|
||||
|
||||
after_create do |build|
|
||||
|
@ -461,10 +461,6 @@ module Ci
|
|||
end
|
||||
end
|
||||
|
||||
def set_protected
|
||||
self.protected = pipeline.protected
|
||||
end
|
||||
|
||||
def erase_trace!
|
||||
trace.erase!
|
||||
end
|
||||
|
|
|
@ -36,9 +36,9 @@ module Ci
|
|||
validates :sha, presence: { unless: :importing? }
|
||||
validates :ref, presence: { unless: :importing? }
|
||||
validates :status, presence: { unless: :importing? }
|
||||
validates :protected, inclusion: { in: [true, false], unless: :importing? }, on: :create
|
||||
validate :valid_commit_sha, unless: :importing?
|
||||
|
||||
before_save :set_protected
|
||||
after_create :keep_around_commits, unless: :importing?
|
||||
|
||||
enum source: {
|
||||
|
@ -445,10 +445,6 @@ module Ci
|
|||
statuses.latest.status || 'skipped'
|
||||
end
|
||||
|
||||
def set_protected
|
||||
self.protected = project.protected_for?(self.ref)
|
||||
end
|
||||
|
||||
def keep_around_commits
|
||||
return unless project
|
||||
|
||||
|
|
|
@ -12,7 +12,8 @@ module Ci
|
|||
tag: tag?,
|
||||
trigger_requests: Array(trigger_request),
|
||||
user: current_user,
|
||||
pipeline_schedule: schedule
|
||||
pipeline_schedule: schedule,
|
||||
protected: project.protected_for?(ref)
|
||||
)
|
||||
|
||||
result = validate(current_user,
|
||||
|
|
|
@ -28,7 +28,8 @@ module Gitlab
|
|||
attributes.merge(project: project,
|
||||
ref: pipeline.ref,
|
||||
tag: pipeline.tag,
|
||||
trigger_request: trigger)
|
||||
trigger_request: trigger,
|
||||
protected: protected_ref?)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -43,6 +44,12 @@ module Gitlab
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def protected_ref?
|
||||
@protected_ref ||= project.protected_for?(pipeline.ref)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue