# Conflicts:
#	app/assets/javascripts/pages/projects/project.js
#	app/assets/stylesheets/framework/variables.scss
#	app/finders/template_finder.rb
#	app/helpers/button_helper.rb
#	app/views/projects/_home_panel.html.haml
#	doc/user/markdown.md
#	locale/gitlab.pot

[ci skip]

Explicit hashed path check for trace, prevents background migration from…

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

Add User-Agent to production_json.log

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

CE upstream - 2018-09-05 21:23 UTC

Closes #6136

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

Jira DVCS docs - Call out differences between 11.3 and before

Closes #7400

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

Update user markdown documentation for CommonMark

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

Update user markdown documentation for CommonMark

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

Enable CommonMark for files and wikis

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

Fix LineBreakAroundConditionalBlock cop for a conditional after rescue

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

Resolve "Improve project overview UI"

Closes #44704

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

port "Improve project overview UI" to EE

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

Upgraded Monaco editor version

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

Expand instance-level templates to cover .gitlab-ci.yml, .gitignore and Dockerfile

Closes #5306

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

CE backport of changes that introduce custom instance-level templates to EE

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

Bump browser gem to v2.5.3

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

Full list of changes: https://github.com/fnando/browser/blob/master/CHANGELOG.md

This will help production gain more visibility which browsers may be
having issues.

# Conflicts:
#	app/views/groups/labels/index.html.haml
#	doc/ci/yaml/README.md
#	lib/gitlab/ci/config.rb

[ci skip]

Add route information to lograge structured logging for API logs

Closes #50993

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

Fix documentation on upgrading when using a Helm chart

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

Fix an error in docs about fetching artifacts using API

Closes gitlab-ce#50883

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

Add support for advanced CI/CD config extension with `extends:`

Closes gitlab-ee#6136

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

Add support for advanced CI/CD config extension / EE

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

Fix app/views/projects/settings/repository/show.html.haml

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

Merge branch 'ee-45938-postgres-timeout-when-counting-number-of-ci-builds-for-usage-ping' into 'master'

Resolve "Postgres timeout when counting number of CI builds for usage ping"

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