# 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

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.

In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16027 it was
added to write `gitlab.fullpath` in the git config of all
repositories. But this only writes them on move or migrate to hashed
storage.

This adds a migration that writes the fullpath to all the
repositories.

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

# Conflicts:
#	app/assets/javascripts/pages/projects/issues/form.js
#	locale/gitlab.pot

[ci skip]

Lock writes to trace stream

Closes #51502

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

CE upstream - 2018-11-27 14:23 UTC

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

Correctly handle data-loss scenarios when encrypting columns

Closes #53763

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

If the EncryptColumns background migration runs in a sidekiq with a
stale view of the database schema, or when the purported destination
columns don't actually exist, data loss can result. Attempt to work
around these issues by reloading schema information before running
the migration, and raising errors if the model reports that any of its
source or destination columns are missing.

This assignment is only used by the Projects::NetworkController, so
we're needlessly assigning this very generically-named instance variable
on every controller which includes `ExtractsPath`, which is quite a few.

Further, the way we were passing this hash to
`HashWithIndifferentAccess` caused the following deprecation warning
after upgrading to Rails 5:

    DEPRECATION WARNING: #to_hash unexpectedly ignores parameter
    filtering, and will change to enforce it in Rails 5.1. Enable
    `raise_on_unfiltered_parameters` to respect parameter filtering,
    which is the default in new applications. For the existing
    deprecated behaviour, call #to_unsafe_h instead. (called from new at
    lib/extracts_path.rb:116)

Resolve "Jump to top in merge request"

Closes #52276

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

Suggest issues when typing title

Closes #22071

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

EE port of issuable-suggestions

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