Previously, if a user was a guest member of a private project, they
could access the merge request template as we were not checking
permission-levels of the user.

When a issue template is asked for, the user must have :read_issue for
the project; or :read_merge_request when a merge request template is
asked for.

We also now rescue_from FileNotFoundError and handle as 404. This is
because RepoTemplateFinder can raise a FileNotFoundError exception,
which Rails previously handled as a 500.

Handling these in a way that is consistent with
ActiveRecord::RecordNotFound exceptions, within controllers that
inherit from Projects::ApplicationController at least, and returning a
404.

https://gitlab.com/gitlab-org/gitlab-ce/issues/54943

[ci skip]

Prepare 11.11.3 release

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

Add git 2.21 install from update_source

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

Fix OpenID Connect documentation

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

(cherry picked from commit 5997cc89)

6dcbf1f5 Fix OpenID Connect documentation

Make OpenID Connect work without requiring a name

Closes #62208

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

(cherry picked from commit ad94a024)

a30d8e4a Make OpenID Connect work without requiring a name

Update rspec-retry to fix Selenium NoSuchDriverError errors

Closes #58882

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

(cherry picked from commit 70a717da)

91895eac Update rspec-retry to fix Selenium NoSuchDriverError errors

Revert "Fix callback url"

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

(cherry picked from commit dd0d9b27)

8835bdad Revert "Merge branch 'patch-43' into 'master'"

Fix label click scrolling to top

Closes #61246

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

(cherry picked from commit 92b06c13)

c9c7fa7b Fix label click scrolling to top

Revert "Disable retrying cancelled jobs"

Closes #62350

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

(cherry picked from commit 8501edcd)

e58e24b4 Revert "Merge branch..."

Fix connection to Tiller error while uninstalling

Closes #62713

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

(cherry picked from commit eebdfbc3)

c7d50ddf Fix connection to Tiller error while uninstalling

Revert a default GIT_DEPTH for MR pipeline

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

(cherry picked from commit 765917dc)

dbd62232 Revert a default GIT_DEPTH for MR pipeline

Fix invalid visibility string comparison in project import

Closes #61692

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

(cherry picked from commit add00b69)

5c8cd42b Fix invalid visibility string comparison in project import

Docs: Update documentation with CI variable types usage example

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

(cherry picked from commit 0702d4b6)

706dfdb7 Add CI variable types usage example
7b9a52c0 Update screenshot to match latest CI variables UI
83cd1a76 Fix typo in CI variables docs
3e5b4ce8 Apply suggestion to doc/ci/variables/README.md
b7d820a4 Apply suggestion to doc/ci/variables/README.md
9d2bef55 Apply suggestion to doc/ci/variables/README.md
cb637cc9 Apply suggestion to doc/ci/variables/README.md
c13648a8 Apply suggestion to doc/ci/variables/README.md
121917cb Apply suggestion to doc/ci/variables/README.md
cf95e5ec Apply suggestion to doc/ci/variables/README.md
556d5ebf Apply suggestion to doc/ci/variables/README.md

Update Docs for Chat Notifications

Closes #61867

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

(cherry picked from commit f66aa212)

2770302d Update documentation for chat notifications on deployment events

Update Gitaly to 1.42.4

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

This patch of Gitaly includes a fix of the stderr logger writer to fix a
panic that occured during an edge case.

[ci skip]

Prepare 11.11.2 release

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

Fix project settings not being able to update

Closes #62708

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

Fix migration failure when groups are missing route

Closes #58714

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

(cherry picked from commit 0488c26e)

a52cbf6b Fix migration failure when groups are missing route

Stop two-step rebase from hanging when errors occur

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

This change makes sure Gitaly includes a fix to make rebase work again
properly.

Part of: https://gitlab.com/gitlab-org/gitlab-ce/issues/62353

Disable two_step_rebase feature flag

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

(cherry picked from commit 715d1057)

8104eef0 Disable two_step_rebase feature flag
dd1fa0c2 Apply suggestion to changelogs/unreleased/dm-disable-two-step-rebase.yml

Use source ref in pipeline webhook

Closes #61553

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

(cherry picked from commit 2714f85c)

7e05f3b7 Use source ref for pipeline webhook

Fix OmniAuth OAuth2Generic strategy not loading

Closes #62216

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

(cherry picked from commit 7b5cc7b4)

bf8f4c13 Fix OmniAuth OAuth2Generic strategy not loading

Fix display of promote to group label

Closes #62200

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

(cherry picked from commit 9c2d0d87)

f9a55f93 Fix display of promote to group label
52764ec5 Apply suggestion to spec/helpers/labels_helper_spec.rb
58dc21e7 Apply suggestion to spec/features/projects/labels/user_promotes_label_spec.rb

Update SAST.gitlab-ci.yml - Add SAST_GITLEAKS_ENTROPY_LEVEL

Closes #62179

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

(cherry picked from commit 2ae642f8)

31e181f8 Update SAST.gitlab-ci.yml - Add SAST_GITLEAKS_ENTROPY_LEVEL

Fix height of input groups

Closes #61304, #61303, #59254, and #60778

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

(cherry picked from commit 52758b92)

360646ea Fix height of input groups

[ci skip]

Add DNS rebinding protection settings

See merge request gitlab/gitlabhq!3130

Fix the overriding of EE import params

See merge request gitlab/gitlabhq!3129