# Conflicts:
#	doc/ci/variables/README.md
#	locale/gitlab.pot

[ci skip]

Remove instrumentation for Rouge::Plugins::{Redcarpet,CommonMark}

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

Enable frozen strings in remaining lib/banzai/filter/*.rb files

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

Adds Vuex store to handle the data for tests reports in MR widget

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

The removal in 4d376c66 had an unintended
side effect in that it got rid of the `require 'rouge/plugins/redcarpet'`.

Mention how we use gitlab-triage

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

Replace 'Sidekiq::Testing.inline!' with 'perform_enqueued_jobs'

Closes #22991

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

CE upstream - 2018-07-23 09:40 UTC

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

Enable frozen strings in lib/banzai/filter/*.rb

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

Resolve "Commits page tooltips"

Closes #29278

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

Display GPG status on repository and blob pages

Closes #36046

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

This also fixes a bug with the ImageLazyLoadFilter not doing the right
thing when an existing class attribute is present.

Part of #47424

They're probably needed for:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20729

Pipeline security dashboard: Backport code from EE

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

Pipeline security dashboard: Move EE specific code to EE folder

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

[ci skip]

[ci skip]

[ci skip]

Enable frozen string in newly added files

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

Remove method instrumentation for Banzai filters and reference parsers

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

Reducing the memory footprint for the rendering

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

Fix rendering issue in admin/pages docs

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

Docs: Add a step to install Postgresql related Gems before creating the schema

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

Minor typo fix CODE_QUALITY seems to have a `_` in it in .gitlab-ci.yml default…

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

Resolve "Credentails used for repository import are visible inside the Sidekiq logs (Background Jobs)"

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

Allow feature flag names to be a symbol

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

Document where CI_JOB_TOKEN is used

Closes gitlab-ce#48627

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

Resolve "Document which API is accessible with CI_JOB_TOKEN"

Closes #48627

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

Use title: "Unicorn Metrics available" as in EE

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