Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 2 deletions

diff --git a/app/controllers/projects/releases_controller.rb b/app/controllers/projects/releases_controller.rb
index 08a57a9b146..7ad841d645d 100644
--- a/app/controllers/projects/releases_controller.rb
+++ b/app/controllers/projects/releases_controller.rb
@@ -3,11 +3,12 @@
 class Projects::ReleasesController < Projects::ApplicationController
   # Authorize
   before_action :require_non_empty_project, except: [:index]
-  before_action :release, only: %i[edit update]
+  before_action :release, only: %i[edit show update]
   before_action :authorize_read_release!
   before_action do
     push_frontend_feature_flag(:release_issue_summary, project)
     push_frontend_feature_flag(:release_evidence_collection, project, default_enabled: true)
+    push_frontend_feature_flag(:release_show_page, project)
   end
   before_action :authorize_update_release!, only: %i[edit update]
   before_action :authorize_read_release_evidence!, only: [:evidence]
@@ -29,6 +30,16 @@ class Projects::ReleasesController < Projects::ApplicationController
     end
   end
 
+  def show
+    return render_404 unless Feature.enabled?(:release_show_page, project)
+
+    respond_to do |format|
+      format.html do
+        render :show
+      end
+    end
+  end
+
   protected
 
   def releases
@@ -37,7 +48,9 @@ class Projects::ReleasesController < Projects::ApplicationController
 
   def edit
     respond_to do |format|
-      format.html { render 'edit' }
+      format.html do
+        render :edit
+      end
     end
   end