Updates hint text for merging branches locally.

Closes #39398

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

Fix Error 500s due to encoding issues when Wiki hooks fire

Closes #50590

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

- Hint essentially states that a user should first update their target branch
  with upstream changes and then perform the merge.

Fix Emojis cutting in the right way

Closes #47913

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

Saved Wiki content goes through the GitalyClient::WikiService, which calls
StringIO#set_encoding on the input stream. The problem is that this call
mutates the encoding of the given string object to ASCII-88BIT, which
causes problems for models expecting the data to still be in UTF-8.

Freezing the input disables this behavior:
https://github.com/ruby/ruby/blob/v2_4_4/ext/stringio/stringio.c#L1583

Closes #50590

Move package-and-qa to the test phase

Closes #50718

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

Resolve "Consider reorganizing the QA scenarios"

Closes #49800

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

Fix #47913 (again), revert !21180, fix regression of !8652, improve !20137

Resolve "Error getting performance bar results for <UUID>"

Closes #50801

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

This isn't interesting most of the time and is may go over other flash banners.

These don't have performance data saved as they use Grape.

Rails 5: replace removed silence_stream

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

[ci skip]

[ci skip]

Previously, this wasn't needed: text was normally set to the highlighted
contents anyway. Now, it is: we store different things in text and rich_text.

This caused https://gitlab.com/gitlab-com/production/issues/439.

[ci skip]

[ci skip]

[ci skip]

Closes https://gitlab.com/gitlab-com/migration/issues/766

When backend sends HTML it requires frontend to append it to the DOM causing
XSS vulnerabilities. By removing the `<br>` we avoid those vulnerabilities

Backport `Repository#keep_around` changes from EE to CE

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

[master] Resolve "Orphaned upload files are accessible via project exports"

Closes #2695

See merge request gitlab/gitlabhq!2453

[master] Fixed persistent XSS rendering/escaping of diff location lines

See merge request gitlab/gitlabhq!2463

Block link-local addresses in URLBlocker

See merge request gitlab/gitlabhq!2459

[master] Removes `<br>` sent from backend on tooltips in jobs

See merge request gitlab/gitlabhq!2455

[ci skip]

[ci skip]

[master] Include rich_text in diff cache keys

See merge request gitlab/gitlabhq!2481

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Previously, this wasn't needed: text was normally set to the highlighted
contents anyway. Now, it is: we store different things in text and rich_text.

This caused https://gitlab.com/gitlab-com/production/issues/439.

Change large scale to production

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

Merge branch '50441-high-number-of-statement-timeouts-in-groupdestroyworker-due-to-sitestatistics' into 'master'

Resolve "High number of statement timeouts in GroupDestroyWorker due to SiteStatistics"

Closes #50441

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