# Conflicts:
#	app/controllers/import/base_controller.rb
#	app/models/project_import_state.rb
#	db/schema.rb
#	lib/gitlab/background_migration/populate_import_state.rb
#	lib/gitlab/background_migration/rollback_import_state_data.rb
#	lib/gitlab/legacy_github_import/importer.rb
#	spec/factories/import_state.rb
#	spec/factories/projects.rb
#	spec/lib/gitlab/background_migration/populate_import_state_spec.rb
#	spec/lib/gitlab/background_migration/rollback_import_state_data_spec.rb
#	spec/lib/gitlab/import_export/all_models.yml
#	spec/migrations/migrate_import_attributes_data_from_projects_to_project_mirror_data_spec.rb

[ci skip]

Resolve "Slow SQL  queryid 3278237544  now 3597645274 in production"

Closes #5880

See merge request gitlab-org/gitlab-ee!5570

CE upstream - 2018-05-04 15:26 UTC

See merge request gitlab-org/gitlab-ee!5576

Moves import specific attributes to out of the Project model and into their own model

See merge request gitlab-org/gitlab-ee!5522

fix Web IDE file tree scroll issue

See merge request gitlab-org/gitlab-ce!18721

[Geo] Minor fix for rake geo:status task

See merge request gitlab-org/gitlab-ee!5480

Geo: Refactor FileDownloadDispatchWorker JobFinders and FileRegistryFinders

Closes #5601

See merge request gitlab-org/gitlab-ee!5331

Resolve "Move `import_status` out of `projects`"

See merge request gitlab-org/gitlab-ce!18688

Merge branch 'ee-46049-import-export-import-is-broken-due-to-the-addition-of-a-ci-table' into 'master'

EE Port for: "Resolve "Import/Export (import) is broken due to the addition of a CI table""

See merge request gitlab-org/gitlab-ee!5577

[EE] Enforce application wide terms

See merge request gitlab-org/gitlab-ee!5529

Resolve "Import/Export (import) is broken due to the addition of a CI table"

Closes #46049

See merge request gitlab-org/gitlab-ce!18745

Adds update guide for 10.8 from CE to EE

See merge request gitlab-org/gitlab-ee!5548

Add Group level SAML callback for GitLab.com SSO

Closes #4514

See merge request gitlab-org/gitlab-ee!5575

We need to catch exception when even_log is not found

Ensure web hook 'blocked URL' errors are stored in as web hook logs and properly surfaced to the user

See merge request gitlab-org/gitlab-ce!18746

[ci skip]

# Conflicts:
#	app/controllers/concerns/internal_redirect.rb
#	app/services/application_settings/update_service.rb
#	db/schema.rb
#	doc/administration/index.md
#	doc/api/settings.md
#	locale/gitlab.pot

[ci skip]

Enforce application wide terms

Closes #44798

See merge request gitlab-org/gitlab-ce!18570

[EE] Enforce application wide terms

See merge request gitlab-org/gitlab-ee!5529

Make empty state copy aware of applied filters in Epics list and Roadmap view

See merge request gitlab-org/gitlab-ee!5465

AutoDevOps Docs fix invalid external link

Closes #46056

See merge request gitlab-org/gitlab-ce!18748

Ignore knapsack and rspec_flaky

See merge request gitlab-org/gitlab-ce!18747

Resolve "ee-specific-lines-check should not check against CE master"

Closes #5869

See merge request gitlab-org/gitlab-ee!5564