The intended flow is:

  Soft-delete group (sync) -> Delete group projects (async) -> Hard-delete group (async)

The soft-delete was run in a transaction, which was committed only after
the async job (for hard-deletion) was kicked off. There was a race
condition here - the soft-delete transaction could complete _after_ the
hard delete completed, leaving a soft-deleted record in the database.

This commit removes this race condition. There is no need to run the
soft-delete in a transaction. The soft-delete completes before the async
job is kicked off.

The database should not have any soft-deleted groups. Due to a race
condition (soft-delete completes after the hard-delete), soft-deleted
groups were (incorrectly) left in the database, causing issues while
trying to create a new group with the same name.

CE upstream

See merge request !880

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

Add Redis Sentinel HA docs (port from CE)

See merge request !884

[ci skip]

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

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

[ci skip]

[ci skip]

[ci skip]

[ci skip]

https://gitlab.com/gitlab-org/gitlab-ce/commit/1c994dbc05c147714479288126742f3fee158fd8#diff-4

Fix some failing specs due to missing access_requestable trait

See merge request !7510

Fix POST /internal/allowed to cope with gitlab-shell v4.0.0 project paths

Closes #24496

See merge request !7480

fix shibboleth misconfigurations resulting in authentication bypass

This merge request fixes #22267 where a misconfigured Shibboleth `HTTP_UID` or `HTTP_EPPN` could result in users being logged into an account that did not belong to them.

See merge request !7428

Fix issue where "Without projects" filter admin area shows 0 users incorrectly. Before this fix, if any outstanding group or project invitations exist the count show as 0.

Fixes #3367

See merge request !6611

Allow commit note to be visible if repo is visible

## What does this MR do?

It enforces the `:download_code` permission in `Event#visible_to_user?` for commit notes.

Closes #23824

See merge request !7504

Stopped multiple requests with dropdowns

## What does this MR do?

Fixes an issue where the user dropdown would send 2 requests when the user opens the dropdown.

## What are the relevant issue numbers?

Closes #24131

See merge request !7505

Fixed issue boards counter border when unauthorized

## What does this MR do?

When the user is unauthorized & view issue boards, the border on the counter will not be the whole way around. This fixes that. 

## Screenshots (if relevant)

![Screen_Shot_2016-11-16_at_13.03.36](/uploads/54d97f7f4114044aad3bdc78961a31c8/Screen_Shot_2016-11-16_at_13.03.36.png)

## What are the relevant issue numbers?

Closes #23664

See merge request !7501

Defer saving project services to the database if there are no user changes

## What does this MR do?

It defers saving project services to the database as long as it is possible. It creates a project service when creating a project only if this project service has an active template. After that project services are saved on the first edit.

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

- tests that used `build_missing_services` before the change
- number of queries executed

## Why was this MR needed?

Motivation in #22281

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Fixes #22281

See merge request !6958

Add debug logging and sync troubleshooting information to documentation

See merge request !843

Search for a filename in a project

Closes #23117

See merge request !7426

Opening the user dropdown currently sends 2 requests. This has been changed so only one is sent

Closes #24131

Disable the "request access" functionality by default for new groups and projects

Currently this feature is enabled by default, and additional action is required to disable it.

Closes #21992 
Closes !7011

See merge request !7425

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

gitlab-shell v3.6.6 would give project paths like so:

* namespace/project

gitlab-shell v4.0.0 can give project paths like so:

* /namespace1/namespace2/project
* /namespace/project
* /path/to/repository/storage/namespace1/namespace2/project
* /path/to/repository/storage/namespace/project

Fix UX Guide link on Contributing.md

Current link on the CONTRIBUTING.md page was to the old UI Guide. This should be updated to the new link.

See merge request !7493

Move 'Explore Snippets' Spinach feature to Rspec

## What does this MR do?
It moves the `features/snippets/discover.feature` Spinach test to a Rspec feature.

## Are there points in the code the reviewer needs to double check?
The original feature was called 'Discover Snippets', but the UI no longer reflects this wording. The new Rspec feature is called 'Explore Snippets' to reflect UI/Controller/View naming in use.

## Why was this MR needed?
As part of deprecating the Spinach test suite.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [-] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
  - [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?
#23036

See merge request !7349

Do not create a MergeRequestDiff record when source branch is deleted

Fixes #23413 
Fixes #23897

See merge request !7481

Limit labels returned for a specific project as an administrator

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24527

See merge request !7496

Use setter for key instead AR callback

## What does this MR do?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- n/a [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- n/a API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6763

See merge request !7488

fix labels API adding missing parameter (current_user)

See merge request !7458

Geo: Fix cache clearing after repository update on secondary node

When replicating operations originated from `git`, we don't have the same entry point (`git_push_service.rb`) on the secondary node, and because of that we had to manually duplicate some code after the update happens on the secondary (Pull vs Push).

This MR will introduces the following changes for Geo (#76):

* cache backfilling by `ProjectCacheWorker`
   - The call will switch from normal to **Geo** specific cache building code (when in a secondary node). 
* triggers after_* repository hooks when necessary to clear cache after specific events (when in a secondary node).

Fixes #1129 

cc @marin @dewetblomerus @patricio 

See merge request !869