Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-14 15:07:41 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-14 15:07:41 +0300
commit4ce0bee95df15c05cdb0d777eba31fe753bc443b (patch)
tree3dc6a1aae7e0a01280f6d9f7d774dd369f7863e1 /app/models
parent02ab65d49fc94be7c91e511899762236c122977d (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
-rw-r--r--app/models/ci/trigger.rb13
1 files changed, 2 insertions, 11 deletions
diff --git a/app/models/ci/trigger.rb b/app/models/ci/trigger.rb
index 68548bd2fdc..85cb3f5b46a 100644
--- a/app/models/ci/trigger.rb
+++ b/app/models/ci/trigger.rb
@@ -11,7 +11,7 @@ module Ci
has_many :trigger_requests
validates :token, presence: true, uniqueness: true
- validates :owner, presence: true, unless: :supports_legacy_tokens?
+ validates :owner, presence: true
before_validation :set_default_values
@@ -31,17 +31,8 @@ module Ci
token[0...4] if token.present?
end
- def legacy?
- self.owner_id.blank?
- end
-
- def supports_legacy_tokens?
- Feature.enabled?(:use_legacy_pipeline_triggers, project)
- end
-
def can_access_project?
- supports_legacy_tokens? && legacy? ||
- Ability.allowed?(self.owner, :create_build, project)
+ Ability.allowed?(self.owner, :create_build, project)
end
end
end