diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-08 16:05:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-08 16:05:05 +0300 |
| commit | 8fa311a5de24a28d8190b0a038fb893e71184eb2 (patch) | |
| tree | ae489a4ab340f24312cc1d968f74e5b22ac094d4 /app/models | |
| parent | 0fabe9336cf7cf2a31156931e716e84fc45e842f (diff) | |
Add latest changes from gitlab-org/gitlab@14-0-stable-ee
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/ci/build_metadata.rb | 1 | ||||
| -rw-r--r-- | app/models/integrations/jira.rb | 2 |
2 files changed, 2 insertions, 1 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 diff --git a/app/models/integrations/jira.rb b/app/models/integrations/jira.rb index aa143cc28e1..a5aee35bada 100644 --- a/app/models/integrations/jira.rb +++ b/app/models/integrations/jira.rb @@ -155,7 +155,7 @@ module Integrations end def web_url(path = nil, **params) - return unless url.present? + return '' unless url.present? if Gitlab.com? params.merge!(ATLASSIAN_REFERRER_GITLAB_COM) unless Gitlab.staging? |