Commit e4718a4b authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'nfriend-fix-new-release-page-cancel-button' into 'master'

Fix "Cancel" button on "New Release" page

See merge request gitlab-org/gitlab!39144
parents 9f5fe5d5 66397ac4
...@@ -6,9 +6,9 @@ export default ({ ...@@ -6,9 +6,9 @@ export default ({
releaseAssetsDocsPath, releaseAssetsDocsPath,
manageMilestonesPath, manageMilestonesPath,
newMilestonePath, newMilestonePath,
releasesPagePath,
tagName = null, tagName = null,
releasesPagePath = null,
defaultBranch = null, defaultBranch = null,
}) => ({ }) => ({
projectId, projectId,
...@@ -18,6 +18,7 @@ export default ({ ...@@ -18,6 +18,7 @@ export default ({
releaseAssetsDocsPath, releaseAssetsDocsPath,
manageMilestonesPath, manageMilestonesPath,
newMilestonePath, newMilestonePath,
releasesPagePath,
/** /**
* The name of the tag associated with the release, provided by the backend. * The name of the tag associated with the release, provided by the backend.
...@@ -25,7 +26,6 @@ export default ({ ...@@ -25,7 +26,6 @@ export default ({
*/ */
tagName, tagName,
releasesPagePath,
defaultBranch, defaultBranch,
createFrom: defaultBranch, createFrom: defaultBranch,
......
...@@ -37,7 +37,8 @@ module ReleasesHelper ...@@ -37,7 +37,8 @@ module ReleasesHelper
def data_for_new_release_page def data_for_new_release_page
new_edit_pages_shared_data.merge( new_edit_pages_shared_data.merge(
default_branch: @project.default_branch default_branch: @project.default_branch,
releases_page_path: project_releases_path(@project)
) )
end end
......
---
title: Fix cancel button on New Release page
merge_request: 39144
author:
type: fixed
...@@ -80,6 +80,7 @@ RSpec.describe ReleasesHelper do ...@@ -80,6 +80,7 @@ RSpec.describe ReleasesHelper do
describe '#data_for_new_release_page' do describe '#data_for_new_release_page' do
it 'has the needed data to display the "new release" page' do it 'has the needed data to display the "new release" page' do
keys = %i(project_id keys = %i(project_id
releases_page_path
markdown_preview_path markdown_preview_path
markdown_docs_path markdown_docs_path
update_release_api_docs_path update_release_api_docs_path
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment