Resolve controller conflicts

app/controllers/concerns/lfs_request.rb

@@ -108,7 +108,10 @@ module LfsRequest
     @objects ||= (params[:objects] || []).to_a
   end
 
-<<<<<<< HEAD
+  def has_authentication_ability?(capability)
+    (authentication_abilities || []).include?(capability)
+  end
+
   module EE
     def lfs_forbidden!
       raise NotImplementedError unless defined?(super)
@@ -144,9 +147,4 @@ module LfsRequest
   end
 
   prepend EE
-=======
-  def has_authentication_ability?(capability)
-    (authentication_abilities || []).include?(capability)
-  end
->>>>>>> ce/master
 end

app/controllers/projects/git_http_controller.rb

@@ -51,22 +51,8 @@ class Projects::GitHttpController < Projects::GitHttpClientController
     render plain: exception.message, status: :forbidden
   end
 
-<<<<<<< HEAD
-  def render_denied
-    if user && can?(user, :read_project, project)
-      render plain: access_denied_message, status: :forbidden
-    else
-      # Do not leak information about project existence
-      render_not_found
-    end
-  end
-
-  def access_denied_message
-    access_check.message || 'Access denied'
-=======
   def render_404(exception)
     render plain: exception.message, status: :not_found
->>>>>>> ce/master
   end
 
   def access

app/controllers/projects/imports_controller.rb

@@ -11,13 +11,7 @@ class Projects::ImportsController < Projects::ApplicationController
   end
 
   def create
-<<<<<<< HEAD
     if @project.update_attributes(import_params)
-=======
-    @project.import_url = params[:project][:import_url]
-
-    if @project.save
->>>>>>> ce/master
       @project.reload.import_schedule
     end
 

app/controllers/projects/protected_refs_controller.rb

@@ -48,10 +48,6 @@ class Projects::ProtectedRefsController < Projects::ApplicationController
   protected
 
   def access_level_attributes
-<<<<<<< HEAD
     %i(access_level id user_id _destroy group_id)
-=======
-    %i(access_level id)
->>>>>>> ce/master
   end
 end

app/controllers/sessions_controller.rb

@@ -90,17 +90,12 @@ class SessionsController < Devise::SessionsController
 
     # Prevent a 'you are already signed in' message directly after signing:
     # we should never redirect to '/users/sign_in' after signing in successfully.
-<<<<<<< HEAD
-    if redirect_uri.path == new_user_session_path
+    if redirect_uri.path != new_user_session_path
       return true
     elsif redirect_uri.host == Gitlab.config.gitlab.host && redirect_uri.port == Gitlab.config.gitlab.port
       redirect_to = redirect_uri.to_s
     elsif Gitlab::Geo.geo_node?(host: redirect_uri.host, port: redirect_uri.port)
       redirect_to = redirect_uri.to_s
-=======
-    unless URI(redirect_path).path == new_user_session_path
-      store_location_for(:redirect, redirect_path)
->>>>>>> ce/master
     end
 
     @redirect_to = redirect_to