# Conflicts:
#	app/finders/license_template_finder.rb
#	app/services/groups/destroy_service.rb
#	app/views/admin/application_settings/show.html.haml
#	doc/administration/index.md
#	doc/user/project/import/index.md
#	doc/user/project/import/manifest.md
#	locale/gitlab.pot
#	spec/javascripts/vue_shared/translate_spec.js

[ci skip]

Remove feature flags for UserUpdateBranch

Closes gitaly#1246 and gitaly#1310

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

Fixed Web IDE live preview crashing when loading from merge request

Closes #50392

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

Fix mirror settings anchor

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

Keep project settings sections expanded after submitting form

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

Creates Vue component for commit block in job log view

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

Creates Vue component for trigger variables block in job log page

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

CE upstream - 2018-08-15 15:21 UTC

Closes gitlab-ce#49953

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

Docs: update Pages IP address change + other DNS updates

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

Docs: update Pages IP address change + other DNS updates

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

Just a small fix for a broken link

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

doc: ci/yaml expire_in: the value is in seconds

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

# Conflicts:
#   doc/api/settings.md

Rails5: Enable verbose query logs

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

Add note about Noto Color Emoji font support by default

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

Update Rouge to 3.2.1. Includes a critical fix for the Perl Lexer

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

Fix 1px cutoff of emojis

Closes #47913

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

In modern Linux distros.

Source: https://www.omgubuntu.co.uk/2018/06/use-emoji-linux-ubuntu-apps

Add when the hangouts integration was introduced

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

Frontend: Proper gettext extraction with gettext-extractor

Closes #48864, #42839, and #47092

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

Fix link under custom project template docs

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

Merge branch '50312-instance-statistics-convdev-index-intro-banner-is-not-dismissable' into 'master'

Resolve "Instance Statistics: ConvDev index intro banner is not dismissable"

Closes #50312

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