Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 6 insertions, 15 deletions

diff --git a/app/controllers/projects/releases_controller.rb b/app/controllers/projects/releases_controller.rb
index d3285b64dab..d58755c2655 100644
--- a/app/controllers/projects/releases_controller.rb
+++ b/app/controllers/projects/releases_controller.rb
@@ -13,6 +13,7 @@ class Projects::ReleasesController < Projects::ApplicationController
     push_frontend_feature_flag(:release_asset_link_type, project, default_enabled: true)
   end
   before_action :authorize_update_release!, only: %i[edit update]
+  before_action :authorize_create_release!, only: :new
 
   def index
     respond_to do |format|
@@ -25,11 +26,11 @@ class Projects::ReleasesController < Projects::ApplicationController
 
   def show
     return render_404 unless Feature.enabled?(:release_show_page, project, default_enabled: true)
+  end
 
-    respond_to do |format|
-      format.html do
-        render :show
-      end
+  def new
+    unless Feature.enabled?(:new_release_page, project)
+      redirect_to(new_project_tag_path(@project))
     end
   end
 
@@ -37,22 +38,12 @@ class Projects::ReleasesController < Projects::ApplicationController
     redirect_to link.url
   end
 
-  protected
+  private
 
   def releases
     ReleasesFinder.new(@project, current_user).execute
   end
 
-  def edit
-    respond_to do |format|
-      format.html do
-        render :edit
-      end
-    end
-  end
-
-  private
-
   def authorize_update_release!
     access_denied! unless can?(current_user, :update_release, release)
   end