Resolve conflict in app/controllers/projects/issues_controller.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/controllers/projects/issues_controller.rb

@@ -9,13 +9,8 @@ class Projects::IssuesController < Projects::ApplicationController
   prepend_before_action :authenticate_user!, only: [:new, :export_csv]
 
   before_action :check_issues_available!
-<<<<<<< HEAD
   before_action :issue, except: [:index, :new, :create, :bulk_update, :export_csv]
-  before_action :set_issues_index, only: [:index]
-=======
-  before_action :issue, except: [:index, :new, :create, :bulk_update]
   before_action :set_issuables_index, only: [:index]
->>>>>>> upstream/master
 
   # Allow write(create) issue
   before_action :authorize_create_issue!, only: [:new, :create]

ee/app/controllers/ee/projects/issues_controller.rb

@@ -6,7 +6,7 @@ module EE
       prepended do
         before_action :check_export_issues_available!, only: [:export_csv]
         before_action :check_service_desk_available!, only: [:service_desk]
-        before_action :set_issues_index, only: [:index, :service_desk]
+        before_action :set_issuables_index, only: [:index, :service_desk]
         skip_before_action :issue, only: [:service_desk]
       end