diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-08 06:10:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-08 06:10:25 +0300 |
| commit | d8b3ba4b19f12a88a2aa6881bf770f9713a68d32 (patch) | |
| tree | 2fc2ecd02a7edae8be4502240a09d709b6e8bb6a /app/models | |
| parent | 9f1ce98c1d456b962fc43ec99180e042592fa307 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/ci/build_need.rb | 3 | ||||
| -rw-r--r-- | app/models/ci/runner.rb | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/models/ci/build_need.rb b/app/models/ci/build_need.rb index 3fa17d6d286..03d1bd14bfb 100644 --- a/app/models/ci/build_need.rb +++ b/app/models/ci/build_need.rb @@ -4,6 +4,9 @@ module Ci class BuildNeed < Ci::ApplicationRecord include Ci::Partitionable include BulkInsertSafe + include IgnorableColumns + + ignore_column :id_convert_to_bigint, remove_with: '16.0', remove_after: '2023-04-22' belongs_to :build, class_name: "Ci::Processable", foreign_key: :build_id, inverse_of: :needs diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index 19acd86a7f4..db58a995f0b 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -387,7 +387,10 @@ module Ci end def short_sha - token[0...8] if token + return unless token + + start_index = created_via_ui? ? CREATED_RUNNER_TOKEN_PREFIX.length : 0 + token[start_index..start_index + 8] end def tag_list |