CE->EE Resolve conflicts in specs [ci skip]

spec/fixtures/api/schemas/public_api/v3/issues.json

@@ -63,23 +63,15 @@
       "due_date": { "type": ["date", "null"] },
       "confidential": { "type": "boolean" },
       "web_url": { "type": "uri" },
-<<<<<<< HEAD
       "subscribed": { "type": ["boolean"] },
       "weight": { "type": ["integer", "null"] }
-=======
-      "subscribed": { "type": ["boolean"] }
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
     },
     "required": [
       "id", "iid", "project_id", "title", "description",
       "state", "created_at", "updated_at", "labels",
       "milestone", "assignee", "author", "user_notes_count",
       "upvotes", "downvotes", "due_date", "confidential",
-<<<<<<< HEAD
       "web_url", "subscribed", "weight"
-=======
-      "web_url", "subscribed"
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
     ],
     "additionalProperties": false
   }

spec/fixtures/api/schemas/public_api/v3/merge_requests.json

@@ -72,13 +72,9 @@
       "should_remove_source_branch": { "type": ["boolean", "null"] },
       "force_remove_source_branch": { "type": ["boolean", "null"] },
       "web_url": { "type": "uri" },
-<<<<<<< HEAD
       "subscribed": { "type": ["boolean"] },
       "approvals_before_merge": { "type": ["integer", "null"] },
       "squash": { "type": "boolean" }
-=======
-      "subscribed": { "type": ["boolean"] }
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
     },
     "required": [
       "id", "iid", "project_id", "title", "description",
@@ -88,11 +84,7 @@
       "labels", "work_in_progress", "milestone", "merge_when_build_succeeds",
       "merge_status", "sha", "merge_commit_sha", "user_notes_count",
       "should_remove_source_branch", "force_remove_source_branch",
-<<<<<<< HEAD
       "web_url", "subscribed", "approvals_before_merge", "squash"
-=======
-      "web_url", "subscribed"
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
     ],
     "additionalProperties": false
   }

spec/fixtures/api/schemas/public_api/v4/issues.json

@@ -62,23 +62,15 @@
       "downvotes": { "type": "integer" },
       "due_date": { "type": ["date", "null"] },
       "confidential": { "type": "boolean" },
-<<<<<<< HEAD
       "web_url": { "type": "uri" },
       "weight": { "type": ["integer", "null"] }
-=======
-      "web_url": { "type": "uri" }
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
     },
     "required": [
       "id", "iid", "project_id", "title", "description",
       "state", "created_at", "updated_at", "labels",
       "milestone", "assignee", "author", "user_notes_count",
       "upvotes", "downvotes", "due_date", "confidential",
-<<<<<<< HEAD
       "web_url", "weight"
-=======
-      "web_url"
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
     ],
     "additionalProperties": false
   }

spec/fixtures/api/schemas/public_api/v4/merge_requests.json

@@ -71,13 +71,9 @@
       "user_notes_count": { "type": "integer" },
       "should_remove_source_branch": { "type": ["boolean", "null"] },
       "force_remove_source_branch": { "type": ["boolean", "null"] },
-<<<<<<< HEAD
       "web_url": { "type": "uri" },
       "approvals_before_merge": { "type": ["integer", "null"] },
       "squash": { "type": "boolean" }
-=======
-      "web_url": { "type": "uri" }
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
     },
     "required": [
       "id", "iid", "project_id", "title", "description",
@@ -87,11 +83,7 @@
       "labels", "work_in_progress", "milestone", "merge_when_pipeline_succeeds",
       "merge_status", "sha", "merge_commit_sha", "user_notes_count",
       "should_remove_source_branch", "force_remove_source_branch",
-<<<<<<< HEAD
       "web_url", "approvals_before_merge", "squash"
-=======
-      "web_url"
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
     ],
     "additionalProperties": false
   }

spec/models/project_spec.rb

@@ -72,11 +72,8 @@ describe Project, models: true do
     it { is_expected.to have_many(:project_group_links).dependent(:destroy) }
     it { is_expected.to have_many(:notification_settings).dependent(:destroy) }
     it { is_expected.to have_many(:forks).through(:forked_project_links) }
-<<<<<<< HEAD
     it { is_expected.to have_many(:approver_groups).dependent(:destroy) }
-=======
     it { is_expected.to have_many(:uploads).dependent(:destroy) }
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
 
     context 'after initialized' do
       it "has a project_feature" do

spec/models/user_spec.rb

@@ -32,11 +32,8 @@ describe User, models: true do
     it { is_expected.to have_many(:spam_logs).dependent(:destroy) }
     it { is_expected.to have_many(:todos).dependent(:destroy) }
     it { is_expected.to have_many(:award_emoji).dependent(:destroy) }
-<<<<<<< HEAD
     it { is_expected.to have_many(:path_locks).dependent(:destroy) }
-=======
     it { is_expected.to have_many(:triggers).dependent(:destroy) }
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
     it { is_expected.to have_many(:builds).dependent(:nullify) }
     it { is_expected.to have_many(:pipelines).dependent(:nullify) }
     it { is_expected.to have_many(:chat_names).dependent(:destroy) }

spec/services/groups/create_service_spec.rb

@@ -39,7 +39,6 @@ describe Groups::CreateService, '#execute', services: true do
     end
   end
 
-<<<<<<< HEAD
   context 'repository_size_limit assignment as Bytes' do
     let(:admin_user) { create(:user, admin: true) }
     let(:service) { described_class.new(admin_user, group_params.merge(opts)) }
@@ -62,7 +61,9 @@ describe Groups::CreateService, '#execute', services: true do
 
         expect(group.repository_size_limit).to be_nil
       end
-=======
+    end
+  end
+
   describe 'creating a mattermost team' do
     let!(:params) { group_params.merge(create_chat_team: "true") }
     let!(:service) { described_class.new(user, params) }
@@ -76,7 +77,6 @@ describe Groups::CreateService, '#execute', services: true do
         .and_return({ 'name' => 'tanuki', 'id' => 'lskdjfwlekfjsdifjj' })
 
       expect { subject }.to change { ChatTeam.count }.from(0).to(1)
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
     end
   end
 end