Resolve conflicts

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

app/services/merge_requests/merge_service.rb

@@ -19,24 +19,17 @@ module MergeRequests
       unless @merge_request.mergeable?
         return log_merge_error('Merge request is not mergeable', save_message_on_model: true)
       end
-<<<<<<< HEAD
 
       if @merge_request.target_project.above_size_limit?
         message = Gitlab::RepositorySizeError.new(@merge_request.target_project).merge_error
 
         return log_merge_error(message, save_message_on_model: true)
       end
-=======
->>>>>>> ce/master
 
       @source = find_merge_source
 
       unless @source
-<<<<<<< HEAD
         return log_merge_error('No source for merge', save_message_on_model: true)
-=======
-        log_merge_error('No source for merge', save_message_on_model: true)
->>>>>>> ce/master
       end
 
       merge_request.in_locked_state do

app/views/devise/shared/_tabs_ldap.html.haml

@@ -6,13 +6,8 @@
     %li{ class: (:active unless crowd_enabled? || ldap_enabled?) }
       = link_to "Kerberos", "#kerberos", 'data-toggle' => 'tab'
   - @ldap_servers.each_with_index do |server, i|
-<<<<<<< HEAD
-    %li{ class: (:active if i.zero? && !crowd_enabled?) }
-      = link_to server['label'], "##{server['provider_name']}", 'data-toggle' => 'tab'
-=======
     %li{ class: active_when(i.zero? && !crowd_enabled?) }
       = link_to server['label'], "##{server['provider_name']}",  'data-toggle' => 'tab'
->>>>>>> ce/master
   - if signin_enabled?
     %li
       = link_to 'Standard', '#ldap-standard', 'data-toggle' => 'tab'

app/views/layouts/nav/_dashboard.html.haml

@@ -11,13 +11,6 @@
     = nav_link(controller: :koding) do
       = link_to koding_path, title: 'Koding' do
         %span
-<<<<<<< HEAD
-          Snippets
-
-    = link_to help_path, title: 'About GitLab EE', class: 'about-gitlab' do
-      %span
-        About GitLab EE
-=======
           Koding
   = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
     = link_to dashboard_groups_path, title: 'Groups' do
@@ -43,5 +36,4 @@
         Snippets
   %li.divider
   %li
-    = link_to "About GitLab CE", help_path, title: 'About GitLab CE', class: 'about-gitlab'
->>>>>>> ce/master
+    = link_to "About GitLab EE", help_path, title: 'About GitLab EE', class: 'about-gitlab'

doc/user/project/merge_requests/index.md

@@ -193,8 +193,5 @@ And to check out a particular merge request:
 git checkout origin/merge-requests/1
 ```
 
-<<<<<<< HEAD
-[products]: https://about.gitlab.com/products/ "GitLab products page"
-=======
->>>>>>> ce/master
 [protected branches]: ../protected_branches.md
+[products]: https://about.gitlab.com/products/ "GitLab products page"

spec/services/merge_requests/merge_service_spec.rb

@@ -205,7 +205,6 @@ describe MergeRequests::MergeService, services: true do
         expect(merge_request.merge_commit_sha).to be_nil
         expect(merge_request.merge_error).to include(error_message)
         expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
-<<<<<<< HEAD
       end
     end
   end
@@ -244,8 +243,6 @@ describe MergeRequests::MergeService, services: true do
         allow(project).to receive(:merge_requests_ff_only_enabled) { true }
 
         expect(service.hooks_validation_pass?(merge_request)).to be_truthy
-=======
->>>>>>> ce/master
       end
     end
   end