CE upstream - 2018-11-26 23:21 UTC

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

Move EE specific code from Gitbab::Database into ee

Closes #8584

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

Fix handling of filenames with hash characters in tree view

Closes #54473

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

CE upstream - 2018-11-26 18:21 UTC

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

Addressable::URI interprets the `#` in a URI as a URI fragment
and does not escape it, but Rails has special helpers that treats
these as bona-fide characters that need to be escaped.

Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23368

This commit move EE specific code from GitLab::Database
into ee/, and remove unused methods.

Changes the delete custom metric alert

Closes #4940

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

Fix deadlock on ChunkedIO

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

Rails 5 deprecation: Passing an argument to force an association to reload is now deprecated

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

Resolve "Maven package permissions option wrongly available in Starter"

Closes #8316

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

Allow profiler to authenticate by stubbing users directly

Closes #54327

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

Merge branch '8581-geo-the-geo-nodes-admin-page-display-secondary-database-state-incorrectly' into 'master'

Rails 5: Fix the check whether the database is in read-only mode

Closes #8581

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

# Conflicts:
#	spec/workers/every_sidekiq_worker_spec.rb

[ci skip]

Merge branch '8583-rails5-gitlab-database-loadbalancing-caught_up-returns-state-incorrectly' into 'master'

Raisl 5: Fix Gitlab::Database::LoadBalancing#caught_up? check

Closes #8583

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

Backport of gitlab-ee!8470

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

Extracts EE specific Sidekiq queue config to a new file

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

Add events index on project_id and created_at

Closes #53992

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

Upgrade better_errors gem to 2.5.0

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

CE upstream - 2018-11-26 16:21 UTC

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

Rails 5 returns true/false instead of a string 't' or 'f'.

Rails 5 returns true/false instead of a string 't' or 'f'.

Enable some frozen string in ee/app

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

Fix Image Lazy Loader for some older browsers

Closes #54407

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

Override CI_COMMIT_REF_SLUG for QA branches

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

CE upstream - 2018-11-26 14:21 UTC

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

i18n: externalize strings from 'app/views/layouts'

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

CE port of "Move merge request approval settings"

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

# Conflicts:
#	locale/gitlab.pot

[ci skip]

The `gitlab:assets:compile` job isn't run for the QA branches, thus
there's no Docker image correspinding these branches in the registry.

By overriding `CI_COMMIT_REF_SLUG` to `master` for QA branches, the
`fetch-assets` job in the `omnibus-gitlab` pipeline will pull the
`master` assets Docker image.
Signed-off-by: Rémy Coutable <remy@rymai.me>

[EE] i18n: externalize strings from 'app/views/shared/members'

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

Update externalized strings from `/app/views/project/runners`

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