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/trigger.rb | |
| parent | 9868dae7fc0655bd7ce4a6887d4e6d487690eeed (diff) | |
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42
Diffstat (limited to 'app/models/ci/trigger.rb')
| -rw-r--r-- | app/models/ci/trigger.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/ci/trigger.rb b/app/models/ci/trigger.rb index c4db4754c52..1092b9c9564 100644 --- a/app/models/ci/trigger.rb +++ b/app/models/ci/trigger.rb @@ -6,6 +6,8 @@ module Ci include Limitable include IgnorableColumns + TRIGGER_TOKEN_PREFIX = 'glptt-' + ignore_column :ref, remove_with: '15.4', remove_after: '2022-08-22' self.limit_name = 'pipeline_triggers' @@ -22,7 +24,7 @@ module Ci before_validation :set_default_values def set_default_values - self.token = SecureRandom.hex(15) if self.token.blank? + self.token = "#{TRIGGER_TOKEN_PREFIX}#{SecureRandom.hex(20)}" if self.token.blank? end def last_trigger_request @@ -34,7 +36,7 @@ module Ci end def short_token - token[0...4] if token.present? + token.delete_prefix(TRIGGER_TOKEN_PREFIX)[0...4] if token.present? end def can_access_project? |