Merge branch '59208-fix-error-500-on-every-page-when-active-broadcast-message-present-after-upgrading-to-11-9-0' into 'master'

Gracefully handles excluded fields from attributes during serialization on JsonCache

Closes #59208

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

(cherry picked from commit cc5095ed)

7028b376 Gracefully handles excluded fields from attributes during serialization
1c7a2c05 Add CHANGELOG entry

Move reply to comment tooltip to the top

Closes #59198

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

(cherry picked from commit 75e24b8f)

6f4c0178 Move reply to comment tooltip to the top

GitHub import: Create new branches as project owner

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

(cherry picked from commit 6e74eb4e)

1e6ea914 GitHub import: Create new branches as project owner

Add beta caution to hashed object pools

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

(cherry picked from commit d2c01153)

c149921a Add beta caution to hashed object pools
f7f8f4d0 Link to meta issue

Prepare 11.9.0-rc9 release

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

Phil Hughes authored 5 years ago and John Jarvis committed 5 years ago

Resolve "Merge request page loses state"

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

This reverts commit 99b813dd, reversing
changes made to bc6cc878.

Filipa Lacerda authored 5 years ago and John Jarvis committed 5 years ago

Backport EE CSS addition

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

Nick Thomas authored 5 years ago and John Jarvis committed 5 years ago

Backport EE JavaScript changes for SSH pull mirrors

Closes #56340

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

Fix undefined variable error on json project views

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

(cherry picked from commit 3c5a81cb)

585fcfb9 Fix undefined variable error on json project views

Remove before_script from DAST vendored template

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

(cherry picked from commit 7cfc090d)

0ed42904 Move dast_run under script section, EE counterpart

Fix skipping of user rendering for none and any

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

(cherry picked from commit 142c39ae)

4eb70b90 Fix skipping of user rendering for none and any

Make runners token encryption to be optional

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

(cherry picked from commit bfe4bdcc)

851697a8 Make runners token encryption to be optional

Fix error creating a merge request when diff includes a null byte

Closes #57710

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

(cherry picked from commit a885e2d0)

6552197e Fix error creating a merge request when diff includes a null byte

Hide "Edited" when note is transformed or resolved

Closes #57330

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

(cherry picked from commit 6461cbdf)

f5f243a0 Hide "Edited" when note is transformed or resolved

Hashed Storage: Document Rollback mechanism

Closes #58738

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

(cherry picked from commit 09669e2c)

823695ee Document Storage Rollback mechanism

CE backport of Add Incidents section to Operations settings

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

(cherry picked from commit 11c8b5a1)

f87517e0 Add Incidents section to Operations settings
a28742ad Add feature specs for settings page

Remove unnecessary license check in operations controller

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

(cherry picked from commit 66481881)

44f3dc5b Remove unnecessary license check

Bump Rugged to 0.28.0

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

(cherry picked from commit afeb2dd9)

30caec32 Bump Rugged to 0.28.0

Prepare 11.9.0-rc8 release

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

Fix test environment pollution in spec/lib/gitlab/request_context_spec.rb

Closes #58969

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

(cherry picked from commit ef9b6012)

fcf418d6 Fix test environment pollution in spec/lib/gitlab/request_context_spec.rb

Manually add Ukrainian translations

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

(cherry picked from commit d0053d51)

6ed6a4b8 Manually add Ukrainian translations

Quarantine failing test

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

(cherry picked from commit 1715622c)

77a045c6 Quarantine failing test

Update badge placeholder docs with privacy concerns

Closes #56406

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

(cherry picked from commit d32a7c20)

84577680 Update badge placeholder docs with privacy concerns

Fix incorrect link format in docs

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

(cherry picked from commit 42b7f53b)

af0ca131 Fix incorrect link format in docs

Fix Bitbucket import

Closes #58804

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

(cherry picked from commit 516987e4)

e4663942 Fix Bitbucket import
a89851e7 Added changelog to MR
b5b9925e Removing SHA length validation
4268fc87 Added SHA length validation
2e2e3a8c Small replacement in spec to use a constant

Prepare 11.9.0-rc7 release

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

Allow modifying squash commit message for fast-forward only merge method

Closes #48324, #58805, and #58631

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

Reverts the loading of emojis and its images to move forward with RC

Prepare 11.9.0-rc6 release

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

Mark Lapierre authored 5 years ago and John Jarvis committed 5 years ago

Ignore user status emoji in assertion

Closes gitlab-org/quality/staging#45

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

Rémy Coutable authored 5 years ago and John Jarvis committed 5 years ago

Fix 500 error caused by CODEOWNERS with no matches

Closes gitlab-ee#10282

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

Filipa Lacerda authored 5 years ago and John Jarvis committed 5 years ago

Removes the CDN loading for emojis.json

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

Filter Jira shared secret from logs

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

(cherry picked from commit 6a3b59f8)

36c91555 Filter Jira shared secret from logs

Fix health checks not working behind load balancers

Closes #58573

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

(cherry picked from commit ef19ded4)

01203e71 Fix health checks not working behind load balancers

Backports EE change for expanded pipelines

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

(cherry picked from commit 30e52b23)

f8bac850 Backports EE change for expanded pipelines

Quarantine failing test

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

(cherry picked from commit d20eee85)

3cbcb582 Quarantine failing test