Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 1 deletions

diff --git a/app/controllers/projects/releases_controller.rb b/app/controllers/projects/releases_controller.rb
index 717df9f09e0..0f9cb2dfc31 100644
--- a/app/controllers/projects/releases_controller.rb
+++ b/app/controllers/projects/releases_controller.rb
@@ -2,12 +2,24 @@
 
 class Projects::ReleasesController < Projects::ApplicationController
   # Authorize
-  before_action :require_non_empty_project
+  before_action :require_non_empty_project, except: [:index]
   before_action :authorize_read_release!
   before_action do
     push_frontend_feature_flag(:release_edit_page, project)
   end
 
   def index
+    respond_to do |format|
+      format.html do
+        require_non_empty_project
+      end
+      format.json { render json: releases }
+    end
+  end
+
+  protected
+
+  def releases
+    ReleasesFinder.new(@project, current_user).execute
   end
 end