Add latest changes from gitlab-org/gitlab@master

1 files changed, 23 insertions, 4 deletions

diff --git a/app/helpers/releases_helper.rb b/app/helpers/releases_helper.rb
index 1238567a4ed..a3d944c64cc 100644
--- a/app/helpers/releases_helper.rb
+++ b/app/helpers/releases_helper.rb
@@ -18,21 +18,40 @@ module ReleasesHelper
       illustration_path: illustration,
       documentation_path: help_page
     }.tap do |data|
-      data[:new_release_path] = new_project_tag_path(@project) if can?(current_user, :create_release, @project)
+      if can?(current_user, :create_release, @project)
+        data[:new_release_path] = if Feature.enabled?(:new_release_page, @project)
+                                    new_project_release_path(@project)
+                                  else
+                                    new_project_tag_path(@project)
+                                  end
+      end
     end
   end
 
   def data_for_edit_release_page
+    new_edit_pages_shared_data.merge(
+      tag_name: @release.tag,
+      releases_page_path: project_releases_path(@project, anchor: @release.tag)
+    )
+  end
+
+  def data_for_new_release_page
+    new_edit_pages_shared_data.merge(
+      default_branch: @project.default_branch
+    )
+  end
+
+  private
+
+  def new_edit_pages_shared_data
     {
       project_id: @project.id,
-      tag_name: @release.tag,
       markdown_preview_path: preview_markdown_path(@project),
       markdown_docs_path: help_page_path('user/markdown'),
-      releases_page_path: project_releases_path(@project, anchor: @release.tag),
       update_release_api_docs_path: help_page_path('api/releases/index.md', anchor: 'update-a-release'),
       release_assets_docs_path: help_page(anchor: 'release-assets'),
       manage_milestones_path: project_milestones_path(@project),
-      new_milestone_path: new_project_milestone_url(@project)
+      new_milestone_path: new_project_milestone_path(@project)
     }
   end
 end