diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/helpers/releases_helper.rb | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/helpers/releases_helper.rb')
-rw-r--r-- | app/helpers/releases_helper.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/helpers/releases_helper.rb b/app/helpers/releases_helper.rb index a3d944c64cc..f1dff18523f 100644 --- a/app/helpers/releases_helper.rb +++ b/app/helpers/releases_helper.rb @@ -19,7 +19,7 @@ module ReleasesHelper documentation_path: help_page }.tap do |data| if can?(current_user, :create_release, @project) - data[:new_release_path] = if Feature.enabled?(:new_release_page, @project) + data[:new_release_path] = if Feature.enabled?(:new_release_page, @project, default_enabled: true) new_project_release_path(@project) else new_project_tag_path(@project) @@ -37,7 +37,8 @@ module ReleasesHelper def data_for_new_release_page new_edit_pages_shared_data.merge( - default_branch: @project.default_branch + default_branch: @project.default_branch, + releases_page_path: project_releases_path(@project) ) end |