diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-15 06:07:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-15 06:07:10 +0300 |
commit | 7eea19a9f4b74928e6cd104f489e2d6cbe08f90f (patch) | |
tree | 50ad2c3a806a63bd24e6acf49d6483505d4263fc /app/assets | |
parent | 5f545e48389a6811694da0029cad7048f4a0e6f3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/pages/projects/forks/new/components/fork_form.vue | 5 | ||||
-rw-r--r-- | app/assets/javascripts/pages/projects/forks/new/index.js | 2 |
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, |