From 8fa311a5de24a28d8190b0a038fb893e71184eb2 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 8 Jul 2021 13:05:05 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-0-stable-ee

---
 .../javascripts/filtered_search/available_dropdown_mappings.js      | 2 +-
 .../infrastructure_registry/components/terraform_installation.vue   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/assets')

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>"
 }`;
     },
-- 
cgit v1.2.1