Fix specs conflicts

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

spec/features/merge_requests/closes_issues_spec.rb

@@ -81,7 +81,6 @@ feature 'Merge Request closing issues message', feature: true, js: true do
     it 'does not display closing issue message' do
       expect(page).to have_content("Closes issue #{issue_1.to_reference}. Issue #{issue_2.to_reference} is mentioned but will not be closed.")
       expect(page).to have_content("Issue #{issue_2.to_reference} is mentioned but will not be closed.")
-<<<<<<< HEAD
     end
   end
 
@@ -96,8 +95,6 @@ feature 'Merge Request closing issues message', feature: true, js: true do
     it 'displays closing issue message exactly one time' do
       wait_for_ajax
       expect(page).to have_content("Closes issues #{issue_1.to_reference} and #{issue_2.to_reference}", count: 1)
-=======
->>>>>>> upstream/master
     end
   end
 end

spec/features/security/project/private_access_spec.rb

@@ -515,36 +515,6 @@ describe "Private Project Access", feature: true  do
     it { is_expected.to be_denied_for(:visitor) }
   end
 
-<<<<<<< HEAD
-  context "when license blocks changes" do
-    before do
-      allow(License).to receive(:block_changes?).and_return(true)
-    end
-
-    describe "GET /:project_path/issues/new" do
-      subject { new_namespace_project_issue_path(project.namespace, project) }
-
-      it { is_expected.to be_denied_for(:master).of(project) }
-      it { is_expected.to be_denied_for(:reporter).of(project) }
-      it { is_expected.to be_denied_for(:admin) }
-      it { is_expected.to be_denied_for(:guest).of(project) }
-      it { is_expected.to be_denied_for(:user) }
-      it { is_expected.to be_denied_for(:auditor) }
-      it { is_expected.to be_denied_for(:visitor) }
-    end
-
-    describe "GET /:project_path/merge_requests/new" do
-      subject { new_namespace_project_merge_request_path(project.namespace, project) }
-
-      it { is_expected.to be_denied_for(:master).of(project) }
-      it { is_expected.to be_denied_for(:reporter).of(project) }
-      it { is_expected.to be_denied_for(:admin) }
-      it { is_expected.to be_denied_for(:guest).of(project) }
-      it { is_expected.to be_denied_for(:user) }
-      it { is_expected.to be_denied_for(:auditor) }
-      it { is_expected.to be_denied_for(:visitor) }
-    end
-=======
   describe "GET /:project_path/pipeline_schedules" do
     subject { namespace_project_pipeline_schedules_path(project.namespace, project) }
 
@@ -585,7 +555,36 @@ describe "Private Project Access", feature: true  do
     it { is_expected.to be_denied_for(:user) }
     it { is_expected.to be_denied_for(:external) }
     it { is_expected.to be_denied_for(:visitor) }
->>>>>>> upstream/master
+  end
+
+  context "when license blocks changes" do
+    before do
+      allow(License).to receive(:block_changes?).and_return(true)
+    end
+
+    describe "GET /:project_path/issues/new" do
+      subject { new_namespace_project_issue_path(project.namespace, project) }
+
+      it { is_expected.to be_denied_for(:master).of(project) }
+      it { is_expected.to be_denied_for(:reporter).of(project) }
+      it { is_expected.to be_denied_for(:admin) }
+      it { is_expected.to be_denied_for(:guest).of(project) }
+      it { is_expected.to be_denied_for(:user) }
+      it { is_expected.to be_denied_for(:auditor) }
+      it { is_expected.to be_denied_for(:visitor) }
+    end
+
+    describe "GET /:project_path/merge_requests/new" do
+      subject { new_namespace_project_merge_request_path(project.namespace, project) }
+
+      it { is_expected.to be_denied_for(:master).of(project) }
+      it { is_expected.to be_denied_for(:reporter).of(project) }
+      it { is_expected.to be_denied_for(:admin) }
+      it { is_expected.to be_denied_for(:guest).of(project) }
+      it { is_expected.to be_denied_for(:user) }
+      it { is_expected.to be_denied_for(:auditor) }
+      it { is_expected.to be_denied_for(:visitor) }
+    end
   end
 
   describe "GET /:project_path/container_registry" do

spec/fixtures/api/schemas/entities/merge_request.json

@@ -44,10 +44,7 @@
     "mergeable_discussions_state": { "type": "boolean" },
     "conflicts_can_be_resolved_in_ui": { "type": "boolean" },
     "branch_missing": { "type": "boolean" },
-<<<<<<< HEAD
     "commits_count": { "type": ["integer", "null"] },
-=======
->>>>>>> upstream/master
     "has_conflicts": { "type": "boolean" },
     "can_be_merged": { "type": "boolean" },
     "project_archived": { "type": "boolean" },
@@ -96,7 +93,6 @@
     "diverged_commits_count": { "type": "integer" },
     "commit_change_content_path": { "type": "string" },
     "remove_wip_path": { "type": "string" },
-<<<<<<< HEAD
     // EE-specific
     "rebase_commit_sha": { "type": ["string", "null"] },
     "approvals_before_merge": { "type": ["integer", "null"] },
@@ -108,9 +104,6 @@
     "approved": { "type": "boolean" },
     "approvals_path": { "type": ["string", "null"] },
     "ff_only_enabled": { "type": "boolean" }
-=======
-    "commits_count": { "type": "integer" }
->>>>>>> upstream/master
   },
   "additionalProperties": false
 }

spec/fixtures/api/schemas/entities/merge_request_basic.json

@@ -8,12 +8,8 @@
     "total_time_spent": { "type": "integer" },
     "human_time_estimate": { "type": ["string", "null"] },
     "human_total_time_spent": { "type": ["string", "null"] },
-<<<<<<< HEAD
     "merge_error": { "type": ["string", "null"] },
     "rebase_in_progress": { "type": "boolean" }
-=======
-    "merge_error": { "type": ["string", "null"] }
->>>>>>> upstream/master
   },
   "additionalProperties": false
 }