Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 3 deletions

diff --git a/app/assets/javascripts/snippets/components/edit.vue b/app/assets/javascripts/snippets/components/edit.vue
index 6e3a670dc38..2c067a36f75 100644
--- a/app/assets/javascripts/snippets/components/edit.vue
+++ b/app/assets/javascripts/snippets/components/edit.vue
@@ -88,7 +88,9 @@ export default {
     },
     cancelButtonHref() {
       if (this.newSnippet) {
-        return this.projectPath ? `/${this.projectPath}/-/snippets` : `/-/snippets`;
+        return this.projectPath
+          ? `${gon.relative_url_root}${this.projectPath}/-/snippets`
+          : `${gon.relative_url_root}-/snippets`;
       }
       return this.snippet.webUrl;
     },
diff --git a/app/assets/javascripts/snippets/components/snippet_header.vue b/app/assets/javascripts/snippets/components/snippet_header.vue
index ed087dcfaf9..057756f7d64 100644
--- a/app/assets/javascripts/snippets/components/snippet_header.vue
+++ b/app/assets/javascripts/snippets/components/snippet_header.vue
@@ -97,7 +97,7 @@ export default {
           text: __('New snippet'),
           href: this.snippet.project
             ? `${this.snippet.project.webUrl}/-/snippets/new`
-            : '/-/snippets/new',
+            : `${gon.relative_url_root}-/snippets/new`,
           variant: 'success',
           category: 'secondary',
           cssClass: 'ml-2',
@@ -137,7 +137,7 @@ export default {
     redirectToSnippets() {
       window.location.pathname = this.snippet.project
         ? `${this.snippet.project.fullPath}/-/snippets`
-        : 'dashboard/snippets';
+        : `${gon.relative_url_root}dashboard/snippets`;
     },
     closeDeleteModal() {
       this.$refs.deleteModal.hide();