Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 1 deletions

diff --git a/app/assets/javascripts/pages/projects/forks/new/components/fork_form.vue b/app/assets/javascripts/pages/projects/forks/new/components/fork_form.vue
index 0f234fe3dbe..2028af8b8f0 100644
--- a/app/assets/javascripts/pages/projects/forks/new/components/fork_form.vue
+++ b/app/assets/javascripts/pages/projects/forks/new/components/fork_form.vue
@@ -57,6 +57,9 @@ export default {
     visibilityHelpPath: {
       default: '',
     },
+    cancelPath: {
+      default: '',
+    },
     projectFullPath: {
       default: '',
     },
@@ -372,7 +375,7 @@ export default {
         class="gl-mr-3"
         data-testid="cancel-button"
         :disabled="isSaving"
-        :href="projectFullPath"
+        :href="cancelPath"
       >
         {{ s__('ForkProject|Cancel') }}
       </gl-button>
diff --git a/app/assets/javascripts/pages/projects/forks/new/index.js b/app/assets/javascripts/pages/projects/forks/new/index.js
index d3a5ce5390f..a31b8b1a1f4 100644
--- a/app/assets/javascripts/pages/projects/forks/new/index.js
+++ b/app/assets/javascripts/pages/projects/forks/new/index.js
@@ -11,6 +11,7 @@ const {
   newGroupPath,
   projectFullPath,
   visibilityHelpPath,
+  cancelPath,
   projectId,
   projectName,
   projectPath,
@@ -30,6 +31,7 @@ new Vue({
   provide: {
     newGroupPath,
     visibilityHelpPath,
+    cancelPath,
     endpoint,
     projectFullPath,
     projectId,