Fix merge conflicts and DRY spec with `create_list`

db/schema.rb

@@ -10,11 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
 ActiveRecord::Schema.define(version: 2019_10_26_124116) do
-=======
-ActiveRecord::Schema.define(version: 2019_10_24_134020) do
->>>>>>> Add index on issue status for Zoom Meetings table
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"

spec/lib/gitlab/usage_data_spec.rb

@@ -19,16 +19,11 @@ describe Gitlab::UsageData do
       create(:service, project: projects[2], type: 'SlackService', active: true)
       create(:project_error_tracking_setting, project: projects[0])
       create(:project_error_tracking_setting, project: projects[1], enabled: false)
-      create(:issue, project: projects[0])
-      create(:issue, project: projects[0])
-      create(:issue, project: projects[0])
-      create(:issue, project: projects[0])
+      create_list(:issue, 4, project: projects[0])
       create(:zoom_meeting, project: projects[0], issue: projects[0].issues[0], issue_status: :added)
-      create(:zoom_meeting, project: projects[0], issue: projects[0].issues[1], issue_status: :removed)
-      create(:zoom_meeting, project: projects[0], issue: projects[0].issues[1], issue_status: :removed)
+      create_list(:zoom_meeting, 2, project: projects[0], issue: projects[0].issues[1], issue_status: :removed)
       create(:zoom_meeting, project: projects[0], issue: projects[0].issues[2], issue_status: :added)
-      create(:zoom_meeting, project: projects[0], issue: projects[0].issues[2], issue_status: :removed)
-      create(:zoom_meeting, project: projects[0], issue: projects[0].issues[2], issue_status: :removed)
+      create_list(:zoom_meeting, 2, project: projects[0], issue: projects[0].issues[2], issue_status: :removed)
       gcp_cluster = create(:cluster, :provided_by_gcp)
       create(:cluster, :provided_by_user)
       create(:cluster, :provided_by_user, :disabled)