# Conflicts:
#	.gitlab-ci.yml
#	app/controllers/projects/imports_controller.rb
#	app/workers/stuck_import_jobs_worker.rb
#	lib/gitlab/import_export/import_export.yml
#	locale/gitlab.pot
#	spec/factories/projects.rb
#	spec/models/project_spec.rb

[ci skip]

[docs] Stop documenting defunct global variables reset

Closes gitlab-runner#3320

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

CE upstream - 2018-11-28 10:21 UTC

Closes gitlab-ce#51506, gitlab-ce#41776, and gitlab-ce#50812

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

Removes all the irrelevant import related code and columns

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

Removes all the irrelevant code and columns that were migrated from the Project…

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

Left shift security in our workflow

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

Add an automatic job to run QA smoke tests against Review Apps

Closes #49570

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

[EE] Add an automatic job to run QA smoke tests against Review Apps

Closes gitlab-ce#49570

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

Clearer docs when it is OK for maintainer to squash

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

Forward @gitlab/svg to latest version

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

# Conflicts:
#	app/assets/javascripts/diffs/components/inline_diff_view.vue
#	app/assets/javascripts/diffs/components/parallel_diff_view.vue

[ci skip]

Update to bootstrap 4.1.3

Closes #51397

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

Disable password autocomplete in mirror form fill

Closes #50812

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

Also adds Changelog entry

Also adds Changelog entry

CE upstream - 2018-11-27 21:21 UTC

Closes gitlab-ce#54503

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

Improve discussion rendering performance

Closes #51506

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

EE port of discussion-perf-fixes

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

Chrome and other browsers ignore autocomplete=false and autocomplete=off
now. This causes the mirroring section to expand whenever a user clicked
"Expand" in the Repository settings.

https://developers.google.com/web/fundamentals/design-and-ux/input/forms/?hl=en
recommends using new-password as the new field to prevent automatic
filling.

It looks like we already do this in app/views/shared/_field.html.haml.

This is a CE backport of
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8477.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50812

Remove `options` assignment from ExtractsPath

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

Migration to write fullpath in all repository configs

Closes #41776

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

using_docker_images.md: document services inheriting dns and addn hosts settings

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

Add notice for web temrinal on GitLab.com

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

Geo: remove geo check after database replication

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

Always prefer flash-text as display block

Closes #53920

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

Update d3 to match the mermaid version

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

Or otherwise do not try to write repo config.

There is no need to make a difference between a Group or User
namespace, so also no need to define the classes of those.

And run in intervals.