diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-08 13:05:05 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-08 13:05:05 +0000 |
| commit | 8fa311a5de24a28d8190b0a038fb893e71184eb2 (patch) | |
| tree | ae489a4ab340f24312cc1d968f74e5b22ac094d4 /app/assets/javascripts | |
| parent | 0fabe9336cf7cf2a31156931e716e84fc45e842f (diff) | |
| download | gitlab-ce-8fa311a5de24a28d8190b0a038fb893e71184eb2.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-0-stable-ee
Diffstat (limited to 'app/assets/javascripts')
2 files changed, 4 insertions, 4 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>" }`; }, |