[ci skip]

Merge branch 'jej/mattermost-notification-confidentiality' into 'security-10-4'

See merge request gitlab/gitlabhq!2367

Prevent notes on confidential issues from being sent to chat

See merge request gitlab/gitlabhq!2248

Backport of "Fix XSS on commit diff view" for 10-4

See merge request gitlab/gitlabhq!2325

Port of fix milestone bug - escape milestone name

See merge request gitlab/gitlabhq!2360

[ci skip]

Prepare 10.4.6

See merge request gitlab/gitlabhq!2356

[10.4] Fix GitLab Auth0 integration signs in the wrong user

See merge request gitlab/gitlabhq!2352

[10.4] Server Side Request Forgery in Services and Web Hooks

See merge request gitlab/gitlabhq!2347

[ci skip]

Prepare 10.4.5

See merge request gitlab/gitlabhq!2341

Update gitlab-pages version (GitLab 10.4)

See merge request gitlab/gitlabhq!2318

Ensure that OTP backup codes are always invalidated (10.4 port)

See merge request gitlab/gitlabhq!2327

[ci skip]

Prepare 10.4.4 release

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

Fixed bug with the user synced attributes when the user doesn't exist

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

Fixed user synced attributes metadata after removing current provider

Closes #37528

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

Update Prometheus vendor YML for 2.1 support

[ci skip]

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

[10.4.4 port] Resolve "PrepareUntrackedUploads PostgreSQL syntax error"

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

To finish migrating untracked files to uploads for installations that were affected by https://gitlab.com/gitlab-org/gitlab-ce/issues/42881

Or just to delete the temp table if it is empty and left behind.

Only set cwd on the newly spawned process, instead of the current one

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

Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd

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

Update labels migration timestamp to run earlier than the one that removes namespaces to avoid issues

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

Validate user namespace before saving so that errors persist on model

Closes #42140

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

Avoid error when creating forks and restricted levels are defined

Closes #42607

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

Resolve "GitLab import leaves `group_id` on ProjectLabel"

Closes #42696

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

Cleanup new branch/merge request form in issues

Closes #41938

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

Merge branch '42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass' into 'master'

Resolve "Error 500 loading merge request: undefined method `index' for nil:NilClass"

Closes #42160

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

Fix JIRA not working when a trailing slash is included

Closes #42494

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