[ci skip]

[ci skip]

Gracefully recover from previously failed rebase

Closes #1119

See merge request !857

[ci skip]

[ci skip]

[ci skip]

[ci skip]

[ci skip]

Remove order-dependent expectation

Fixes #24341, hopefully

See merge request !7385

CE Upstream

See merge request !859

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6274

CE upstream

CE changes https://gitlab.com/gitlab-org/gitlab-ce/compare/d636efbe26ee51030bb108d889c2ef867570358a...0c36b810abede73b3cf59f951e7467dbac54ec98?expand_all_diffs=1

See merge request !850

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

Add more highlighting to development docs

Now that docs.gitlab.com has lovely highlighting, we should make sure we use it
everywhere it makes sense!

See merge request !7369

Add query param to filter users by 'external' & 'blocked' type on API

Closes #23731

See merge request !7109

Updated issuable form weight dropdown

Updates the weight dropdown in the issuable form to use the new style

![Screen_Shot_2016-10-14_at_10.42.01](/uploads/311a5d3a169e073c844b013dd7e82913/Screen_Shot_2016-10-14_at_10.42.01.png)

See merge request !802

Apply `*_params_ce << *_params_ee` pattern to ProjectsController

See merge request !852

[ci skip]

Add a link to Git cheatsheet PDF in docs readme

See merge request !7382

[ci skip]

Disable DB writes if node is a GitLab Geo secondary instance

See merge request !834

Change auto selection behaviour of emoji and slash commands to be more UX/Type friendly

## What does this MR do?
In the context of a special command (starting with "/", ":", ...), the MR disables auto selection of first item in the dropdown suggestion menu, until at least a character has been typed.
This behavior change originated from #22058 and #23578 in which problems with the ":" special command were pointed out.

## Are there points in the code the reviewer needs to double check?
At lines +187 and +242 there were originally no sorters. Given what ``DefaultOptions.sorter`` does, I don't think it is a problem.

## Why was this MR needed?
To solve #22058 and #23578 

## Does this MR meet the acceptance criteria?

- [X] [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
  - [ ] 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?
Closes #22058 and #23578 

See merge request !7129

Improve ldap:check errors

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21621. 

See merge request !6601

Remove an extra leading space from diff paste data

## What does this MR do?

Remove an extra leading space from diff paste data.

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

I have checked the following three patterns.

* inline diff
* parallel diff
* blob preview

## Why was this MR needed?

Diff paste data contain an extra leading space.
So it need to remove an extra leading space manually from pasted diff data.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] 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?

#14176

Closes #23899

See merge request !7133

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Integrate CI emails into notification system

Closes #21930

See merge request !6342

Closes #1185