Resolve controller conflicts

app/controllers/projects/application_controller.rb

@@ -57,14 +57,11 @@ class Projects::ApplicationController < ApplicationController
     render_404 unless project.feature_available?(feature, current_user)
   end
 
-<<<<<<< HEAD
-=======
   def check_issuables_available!
     render_404 unless project.feature_available?(:issues, current_user) ||
         project.feature_available?(:merge_requests, current_user)
   end
 
->>>>>>> ce/master
   def method_missing(method_sym, *arguments, &block)
     case method_sym.to_s
     when /\Aauthorize_(.*)!\z/

app/controllers/projects/environments_controller.rb

@@ -130,7 +130,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController
     end
   end
 
-<<<<<<< HEAD
   # The rollout status of an enviroment
   def status
     unless @environment.deployment_service_ready?
@@ -147,7 +146,9 @@ class Projects::EnvironmentsController < Projects::ApplicationController
     else
       serializer = RolloutStatusSerializer.new(project: @project, current_user: @current_user)
       render json: serializer.represent(rollout_status)
-=======
+    end
+  end
+
   def additional_metrics
     respond_to do |format|
       format.json do
@@ -155,7 +156,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController
 
         render json: additional_metrics, status: additional_metrics.any? ? :ok : :no_content
       end
->>>>>>> ce/master
     end
   end
 

app/controllers/projects/issues_controller.rb

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

app/controllers/projects/merge_requests_controller.rb

@@ -643,11 +643,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
   def merge_request_params
     params.require(:merge_request)
-<<<<<<< HEAD
-      .permit(merge_request_params_ce << merge_request_params_ee)
-=======
       .permit(merge_request_params_attributes)
->>>>>>> ce/master
   end
 
   def merge_request_params_attributes
@@ -666,7 +662,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
       :title,
 
       label_ids: []
-    ]
+    ] + merge_request_params_ee
   end
 
   def merge_request_params_ee
@@ -695,15 +691,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   end
 
   def merge_params
-<<<<<<< HEAD
     params.permit(:should_remove_source_branch, :commit_message, :squash)
-=======
-    params.permit(merge_params_attributes)
-  end
-
-  def merge_params_attributes
-    [:should_remove_source_branch, :commit_message]
->>>>>>> ce/master
   end
 
   # Make sure merge requests created before 8.0