summaryrefslogtreecommitdiff
path: root/app/models/ci
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-08 13:05:05 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-08 13:05:05 +0000
commit8fa311a5de24a28d8190b0a038fb893e71184eb2 (patch)
treeae489a4ab340f24312cc1d968f74e5b22ac094d4 /app/models/ci
parent0fabe9336cf7cf2a31156931e716e84fc45e842f (diff)
downloadgitlab-ce-8fa311a5de24a28d8190b0a038fb893e71184eb2.tar.gz
Add latest changes from gitlab-org/gitlab@14-0-stable-ee
Diffstat (limited to 'app/models/ci')
-rw-r--r--app/models/ci/build_metadata.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/ci/build_metadata.rb b/app/models/ci/build_metadata.rb
index bb2dac5cd43..f009e4c6aa1 100644
--- a/app/models/ci/build_metadata.rb
+++ b/app/models/ci/build_metadata.rb
@@ -39,6 +39,7 @@ module Ci
}
ignore_column :build_id_convert_to_bigint, remove_with: '14.2', remove_after: '2021-08-22'
+ ignore_columns :id_convert_to_bigint, remove_with: '14.3', remove_after: '2021-09-22'
def update_timeout_state
timeout = timeout_with_highest_precedence