solve some conflicts

config/initializers/0_inflections.rb

@@ -10,15 +10,14 @@
 # end
 #
 ActiveSupport::Inflector.inflections do |inflect|
-<<<<<<< HEAD
-  inflect.uncountable %w(award_emoji project_statistics system_note_metadata event_log project_registry file_registry)
-  inflect.acronym 'EE'
-=======
   inflect.uncountable %w(
     award_emoji
     project_statistics
     system_note_metadata
+    event_log
     project_auto_devops
+    project_registry
+    file_registry
   )
->>>>>>> upstream/master
+  inflect.acronym 'EE'
 end

db/schema.rb

@@ -11,11 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
 ActiveRecord::Schema.define(version: 20170906160132) do
-=======
-ActiveRecord::Schema.define(version: 20170905112933) do
->>>>>>> upstream/master
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -35,15 +31,8 @@ ActiveRecord::Schema.define(version: 20170905112933) do
     t.string "title", null: false
     t.text "description", null: false
     t.string "logo"
-<<<<<<< HEAD
     t.integer "updated_by"
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
     t.string "header_logo"
-=======
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
->>>>>>> upstream/master
     t.text "description_html"
     t.integer "cached_markdown_version"
   end
@@ -156,7 +145,6 @@ ActiveRecord::Schema.define(version: 20170905112933) do
     t.boolean "authorized_keys_enabled", default: true, null: false
     t.boolean "help_page_hide_commercial_content", default: false
     t.string "help_page_support_url"
-<<<<<<< HEAD
     t.boolean "slack_app_enabled", default: false
     t.string "slack_app_id"
     t.string "slack_app_secret"
@@ -166,6 +154,7 @@ ActiveRecord::Schema.define(version: 20170905112933) do
     t.boolean "allow_group_owners_to_manage_ldap", default: true, null: false
     t.boolean "hashed_storage_enabled", default: false, null: false
     t.boolean "project_export_enabled", default: true, null: false
+    t.boolean "auto_devops_enabled", default: false, null: false
   end
 
   create_table "approvals", force: :cascade do |t|
@@ -173,13 +162,6 @@ ActiveRecord::Schema.define(version: 20170905112933) do
     t.integer "user_id", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-=======
-    t.boolean "password_authentication_enabled"
-    t.integer "performance_bar_allowed_group_id"
-    t.boolean "hashed_storage_enabled", default: false, null: false
-    t.boolean "project_export_enabled", default: true, null: false
-    t.boolean "auto_devops_enabled", default: false, null: false
->>>>>>> upstream/master
   end
 
   add_index "approvals", ["merge_request_id"], name: "index_approvals_on_merge_request_id", using: :btree
@@ -666,7 +648,6 @@ ActiveRecord::Schema.define(version: 20170905112933) do
 
   add_index "forked_project_links", ["forked_to_project_id"], name: "index_forked_project_links_on_forked_to_project_id", unique: true, using: :btree
 
-<<<<<<< HEAD
   create_table "geo_event_log", id: :bigserial, force: :cascade do |t|
     t.datetime "created_at", null: false
     t.integer "repository_updated_event_id", limit: 8
@@ -766,8 +747,6 @@ ActiveRecord::Schema.define(version: 20170905112933) do
   add_index "geo_repository_updated_events", ["project_id"], name: "index_geo_repository_updated_events_on_project_id", using: :btree
   add_index "geo_repository_updated_events", ["source"], name: "index_geo_repository_updated_events_on_source", using: :btree
 
-=======
->>>>>>> upstream/master
   create_table "gpg_keys", force: :cascade do |t|
     t.datetime_with_timezone "created_at", null: false
     t.datetime_with_timezone "updated_at", null: false
@@ -1528,10 +1507,7 @@ ActiveRecord::Schema.define(version: 20170905112933) do
     t.integer "cached_markdown_version"
     t.text "delete_error"
     t.datetime "last_repository_updated_at"
-<<<<<<< HEAD
     t.boolean "disable_overriding_approvers_per_merge_request"
-=======
->>>>>>> upstream/master
     t.integer "storage_version", limit: 2
     t.boolean "resolve_outdated_diff_discussions"
   end
@@ -1989,16 +1965,13 @@ ActiveRecord::Schema.define(version: 20170905112933) do
     t.boolean "support_bot"
     t.string "preferred_language"
     t.string "rss_token"
-<<<<<<< HEAD
     t.boolean "external_email", default: false, null: false
     t.string "email_provider"
     t.boolean "email_opted_in"
     t.string "email_opted_in_ip"
     t.integer "email_opted_in_source_id"
     t.datetime "email_opted_in_at"
-=======
     t.integer "theme_id", limit: 2
->>>>>>> upstream/master
   end
 
   add_index "users", ["admin"], name: "index_users_on_admin", using: :btree
@@ -2171,12 +2144,8 @@ ActiveRecord::Schema.define(version: 20170905112933) do
   add_foreign_key "protected_tag_create_access_levels", "protected_tags", name: "fk_f7dfda8c51", on_delete: :cascade
   add_foreign_key "protected_tag_create_access_levels", "users"
   add_foreign_key "protected_tags", "projects", name: "fk_8e4af87648", on_delete: :cascade
-<<<<<<< HEAD
-  add_foreign_key "push_event_payloads", "events_for_migration", column: "event_id", name: "fk_36c74129da", on_delete: :cascade
   add_foreign_key "push_rules", "projects", name: "fk_83b29894de", on_delete: :cascade
-=======
   add_foreign_key "push_event_payloads", "events", name: "fk_36c74129da", on_delete: :cascade
->>>>>>> upstream/master
   add_foreign_key "releases", "projects", name: "fk_47fe2a0596", on_delete: :cascade
   add_foreign_key "remote_mirrors", "projects", name: "fk_43a9aa4ca8", on_delete: :cascade
   add_foreign_key "services", "projects", name: "fk_71cce407f9", on_delete: :cascade

lib/api/jobs.rb

@@ -71,7 +71,6 @@ module API
         present build, with: Entities::Job
       end
 
-<<<<<<< HEAD
       desc 'Download the artifacts file from a job' do
         detail 'This feature was introduced in GitLab 8.5'
       end
@@ -107,8 +106,6 @@ module API
         present_artifacts!(latest_build.artifacts_file)
       end
 
-=======
->>>>>>> upstream/master
       # TODO: We should use `present_file!` and leave this implementation for backward compatibility (when build trace
       #       is saved in the DB instead of file). But before that, we need to consider how to replace the value of
       #       `runners_token` with some mask (like `xxxxxx`) when sending trace file directly by workhorse.
@@ -214,7 +211,6 @@ module API
 
         builds.where(status: available_statuses && scope)
       end
-<<<<<<< HEAD
 
       def authorize_read_builds!
         authorize! :read_build, user_project
@@ -227,8 +223,6 @@ module API
       def check_cross_project_pipelines_feature!
         not_found!('Project') if job_token_authentication? && !@project.feature_available?(:cross_project_pipelines)
       end
-=======
->>>>>>> upstream/master
     end
   end
 end

spec/lib/gitlab/import_export/all_models.yml

@@ -289,13 +289,10 @@ project:
 - statistics
 - container_repositories
 - uploads
-<<<<<<< HEAD
 - mirror_data
 - source_pipelines
 - sourced_pipelines
-=======
 - members_and_requesters
->>>>>>> upstream/master
 award_emoji:
 - awardable
 - user