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

Remove problematic LDAP::Person validation for new strategy

Closes #42412 and #42359

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

Resolve "Update Nokogiri to 1.8.2"

Closes #42591

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

[ci skip]

Fix using wildcards in protected tags to expose protected variables

See merge request gitlab/gitlabhq!2306

[10.4] Fix stored XSS in code blocks

See merge request gitlab/gitlabhq!2316

[10.4] Fix GH namespace security issue

See merge request gitlab/gitlabhq!2295

Restrict Todo API mark_as_done endpoint to the user's todos only

See merge request gitlab/gitlabhq!2313

Merge branch 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibility' into 'security-10-4'

[Port for security-10-4]: Makes SnippetFinder ensure feature visibility

See merge request gitlab/gitlabhq!2312

[ci skip]

Update Auto-DevOps.gitlab-ci.yml

[ci skip]

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

[ci skip]

Prepare 10.4.2 release

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

Merge branch '42022-allow-users-to-request-access-not-visible-when-project-visibility-is-public' into 'master'

Fix visibility of "Allow users to request access" option in public projects

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

Fix local RSpec tests due to bug in `webpack_bundle_tag`

Closes #42368

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

Merge branch '42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error' into 'master'

Resolve "Import from GitLab.com fails (destination already exists and is not an empty directory error)."

Closes #42327

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

Merge branch '42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit' into 'master'

Resolve "Gitaly::CommitService: Encoding::UndefinedConversionError: U+C124 from UTF-8 to ASCII-8BIT"

Closes #42161

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

Use has_table_privilege for TRIGGER on PostgreSQL

Closes #38634

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

Fix bug in security release with deploy keys migration

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

Resolve "Cannot copy/paste on iOS"

Closes #32546

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

Fix cache clear windows

Closes #42487

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

[ci skip]

Prepare 10.4.1 release

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

Resolve "Spec failure in ./spec/features/issues/spam_issues_spec.rb"

Closes #42361

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

(cherry picked from commit a403011e)

c0d7dd38 Workaround a recaptcha pop-up that cannot be tested

Vendor 10.4 Auto DevOps template

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

Resolve ""This job has not been triggered yet"  after hitting "Retry""

Closes #42119

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

(cherry picked from commit b472411e)

a1f7b2bc Do not render non triggered empty state for pending jobs
30cfcd5a Update tests
63b93664 Adds information for pending state
4b8004c7 Improve pending case test
c414ab84 Improve copy for the pending state

Resolve "Cannot change project visibility from Private (even when owner)"

Closes #40612

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

(cherry picked from commit 4bf2fded)

94f31ccc fix issue in which projects which have forks cannot be changed from private to public
1eefc384 add CHANGELOG.md entry for !16595
003f140c ensure fork_source returns nil when project is the root fork, add tests
96862096 add test to can_change_visibility_level? method
de4993d4 remove redundant forked? check
2c1d7c09 fix spacing and wrap method params in parens

Add confirm when navigating away from page

Closes #42102

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