[ci skip]

Fix log location for audit_events

Related to: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4622

//cc @axil 

See merge request !508

CE upstream

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   app/views/layouts/nav/_admin.html.haml
	both modified:   app/views/layouts/nav/_group_settings.html.haml
	both modified:   doc/README.md

See merge request !501

[ci skip]

Roll back Grack::Auth to fix Git HTTP SPNEGO

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/728

This MR keeps the new Git HTTP request specs, which still pass. It
routes Git HTTP traffic back to Grack::Auth so that we get Kerberos
SPNEGO support back. Just to be sure we also restore the (isolated)
Grack::Auth spec file that contains the only tests for Kerberos SPNEGO
we currently have.


See merge request !504

Merge branch '732-error-500-when-attempting-to-create-mr-undefined-method-approvals_before_merge-for-nil-nilclass' into 'master'

Fix MR creation on fork of deleted project

The `selected_target_project` helper method is used for actions where
`target_project_id` is a top-level parameter, not nested under the
`merge_request` hash.

Even though that logic was wrong, if the target project wasn't a fork,
or was a fork of an active project, this would work through
coincidence (although it might check the wrong value for
`approvals_before_merge`).

If a project was a fork of a deleted project, however, then
`selected_target_project` would be `nil`, causing a 500 error. Ensure
that there is always a target project to compare to.

Closes #732.

See merge request !503

The `selected_target_project` helper method is used for actions where
`target_project_id` is a top-level parameter, not nested under the
`merge_request` hash.

Even though that logic was wrong, if the target project wasn't a fork,
or was a fork of an active project, this would work through
coincidence (although it might check the wrong value for
`approvals_before_merge`).

If a project was a fork of a deleted project, however, then
`selected_target_project` would be `nil`, causing a 500 error. Ensure
that there is always a target project to compare to.

fix attr_encrypted in EE

Same MR as https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4963/ for CE - but EE has some extra attributes missing.

Fixes #19073

See merge request !502

Fix visibility of snippets when searching using ElasticSearch

See merge request !501

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

Add notices about disabling auth features for users with 2FA.

Related to #2979

- Document the proposed changes to the GitLab authentication system.
- This is done because currently, users with 2FA enabled are allowed API access without a 2FA token.

# Tasks

- [ ]  #2979 !xxxx - Document proposed auth changes for 2FA users
    - [x]  Wait for replies on "[potential avenues for documenting the planned changes](https://gitlab.com/gitlab-org/gitlab-ce/issues/2979#note_12591578)"
    - [x]  Update documentation
    - [ ]  CHANGELOG entry?
    - [ ]  Merge conflicts

See merge request !4815

Improve validations and error handling in new CI config entries

## What does this MR do?

This MR improves validation in new CI config.

## Why was this MR needed?

With that it will be easier to handle errors during validation and post-processing.

## What are the relevant issue numbers?

This is a continuation of #15060

See merge request !4560

Clean up some unused templates imported from GitLab CI

## What does this MR do?

Clean up some unused templates imported from GitLab CI, for new developers to easily understand the file/directory structure of Gitlab CE.

## Are there points in the code the reviewer needs to double check?

Be sure if removed files are not used now while the committer checked them once.

## Why was this MR needed?

Because the file/directory structure of the repository should be clear and simple and if so new developers can easily understand the file/directory structure of Gitlab CE.

## What are the relevant issue numbers?

Closes #19158 

## Does this MR meet the acceptance criteria?

- CHANGELOG won't be updated due to repository maintenance
- No documentation created/updated
- No API support added
- Tests
  - [skipped] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4922

Add debugging tips with gdb



See merge request !4522

Removed unneeded word

Pretty simple, improved the wording a bit.

See merge request !4920

[ci skip]

[ci skip]

Validate presence of essential params for diff rendering

## What does this MR do?

Check the presence of essential params before rendering diff content.
## Are there points in the code the reviewer needs to double check?

No
## Why was this MR needed?

To avoid the generated application error
## What are the relevant issue numbers?

#19096

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4917