Add latest changes from gitlab-org/gitlab@14-0-stable-ee

5 files changed, 8 insertions, 6 deletions

diff --git a/app/assets/javascripts/filtered_search/available_dropdown_mappings.js b/app/assets/javascripts/filtered_search/available_dropdown_mappings.js
index 409b4ccbcfa..626a5669067 100644
--- a/app/assets/javascripts/filtered_search/available_dropdown_mappings.js
+++ b/app/assets/javascripts/filtered_search/available_dropdown_mappings.js
@@ -202,7 +202,7 @@ export default class AvailableDropdownMappings {
   getMergeRequestTargetBranchesEndpoint() {
     const endpoint = `${
       gon.relative_url_root || ''
-    }/autocomplete/merge_request_target_branches.json`;
+    }/-/autocomplete/merge_request_target_branches.json`;
 
     const params = {
       group_id: this.getGroupId(),
diff --git a/app/assets/javascripts/packages_and_registries/infrastructure_registry/components/terraform_installation.vue b/app/assets/javascripts/packages_and_registries/infrastructure_registry/components/terraform_installation.vue
index 399a3e086f1..c19ff3b4293 100644
--- a/app/assets/javascripts/packages_and_registries/infrastructure_registry/components/terraform_installation.vue
+++ b/app/assets/javascripts/packages_and_registries/infrastructure_registry/components/terraform_installation.vue
@@ -12,16 +12,16 @@ export default {
     GlSprintf,
   },
   computed: {
-    ...mapState(['packageEntity', 'terraformHelpPath', 'projectPath']),
+    ...mapState(['packageEntity', 'terraformHelpPath', 'gitlabHost', 'projectPath']),
     provisionInstructions() {
       // eslint-disable-next-line @gitlab/require-i18n-strings
       return `module "${this.packageEntity.name}" {
-  source = "${this.projectPath}/${this.packageEntity.name}"
+  source = "${this.gitlabHost}/${this.projectPath}/${this.packageEntity.name}"
   version = "${this.packageEntity.version}"
 }`;
     },
     registrySetup() {
-      return `credentials "gitlab.com" {
+      return `credentials "${this.gitlabHost}" {
   token = "<TOKEN>"
 }`;
     },
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?
diff --git a/app/views/projects/packages/infrastructure_registry/show.html.haml b/app/views/projects/packages/infrastructure_registry/show.html.haml
index e5701343b83..e7c77478170 100644
--- a/app/views/projects/packages/infrastructure_registry/show.html.haml
+++ b/app/views/projects/packages/infrastructure_registry/show.html.haml
@@ -10,6 +10,7 @@
       can_delete: can?(current_user, :destroy_package, @project).to_s,
       svg_path: image_path('illustrations/no-packages.svg'),
       project_name: @project.name,
-      project_path: expose_url(@project.full_path),
+      project_path: @project.root_ancestor.full_path,
+      gitlab_host: Gitlab.config.gitlab.host,
       terraform_help_path: help_page_path('user/infrastructure/index'),
       project_list_url: project_infrastructure_registry_index_path(@project)} }