[CE->EE] Resolve conflicts

app/models/merge_request.rb

@@ -962,13 +962,10 @@ class MergeRequest < ActiveRecord::Base
     true
   end
 
-<<<<<<< HEAD
   def base_pipeline
     @base_pipeline ||= project.pipelines.find_by(sha: merge_request_diff&.base_commit_sha)
   end
 
-=======
->>>>>>> 4a2a6d521a260981482ee8e4931ebf06cb4f5b6a
   private
 
   def write_ref

spec/requests/api/merge_requests_spec.rb

@@ -665,7 +665,6 @@ describe API::MergeRequests do
         post api("/projects/#{fork_project.id}/merge_requests", user2),
         title: 'Test merge_request', target_branch: 'master', source_branch: 'markdown', author: user2, target_project_id: fork_project.id
         expect(response).to have_gitlab_http_status(201)
-<<<<<<< HEAD
       end
     end
 
@@ -737,8 +736,6 @@ describe API::MergeRequests do
             expect(json_response['approvals_before_merge']).to eq(2)
           end
         end
-=======
->>>>>>> 4a2a6d521a260981482ee8e4931ebf06cb4f5b6a
       end
     end
   end
@@ -860,7 +857,6 @@ describe API::MergeRequests do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user), sha: merge_request.diff_head_sha
 
       expect(response).to have_gitlab_http_status(200)
-<<<<<<< HEAD
     end
 
     it "updates the MR's squash attribute" do
@@ -869,8 +865,6 @@ describe API::MergeRequests do
       end.to change { merge_request.reload.squash }
 
       expect(response).to have_http_status(200)
-=======
->>>>>>> 4a2a6d521a260981482ee8e4931ebf06cb4f5b6a
     end
 
     it "enables merge when pipeline succeeds if the pipeline is active" do
@@ -1139,7 +1133,6 @@ describe API::MergeRequests do
       post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/unsubscribe", guest)
 
       expect(response).to have_gitlab_http_status(403)
-<<<<<<< HEAD
     end
   end
 
@@ -1259,8 +1252,6 @@ describe API::MergeRequests do
         expect(json_response['user_has_approved']).to be false
         expect(json_response['user_can_approve']).to be true
       end
-=======
->>>>>>> 4a2a6d521a260981482ee8e4931ebf06cb4f5b6a
     end
   end
 

spec/requests/api/v3/merge_requests_spec.rb

@@ -400,7 +400,6 @@ describe API::MergeRequests do
         post v3_api("/projects/#{fork_project.id}/merge_requests", user2),
         title: 'Test merge_request', target_branch: 'master', source_branch: 'markdown', author: user2, target_project_id: fork_project.id
         expect(response).to have_gitlab_http_status(201)
-<<<<<<< HEAD
       end
     end
 
@@ -461,8 +460,6 @@ describe API::MergeRequests do
             expect(json_response['approvals_before_merge']).to eq(2)
           end
         end
-=======
->>>>>>> 4a2a6d521a260981482ee8e4931ebf06cb4f5b6a
       end
     end
   end