When reading conflicts:

1. Add a `type` field. `text` works as before, and has `sections`;
   `text-editor` is a file with ambiguous conflict markers that can only
   be resolved in an editor.
2. Add a `content_path` field pointing to a JSON representation of the
   file's content for a single file.
3. Hitting `content_path` returns a similar datastructure to the `file`,
   but without the `content_path` and `sections` fields, and with a
   `content` field containing the full contents of the file (with
   conflict markers).

When writing conflicts:

1. Instead of `sections` being at the top level, they are now in a
   `files` array. This matches the read format better.
2. The `files` array contains file hashes, each of which must contain:
   a. `new_path`
   b. `old_path`
   c. EITHER `sections` (which works as before) or `content` (with the
      full content of the resolved file).

Replace unique keyframes mixin with specific keyframe animation names

## What does this MR do?
Replaces `unique-keyframes` mixin with `include-keyframes` mixin

## Are there points in the code the reviewer needs to double check?
Shouldn't be 👍🏻 

## Why was this MR needed?
Some users had GitLab hosted in a distributed environment that makes `unique-keyframes` a non-viable implementation. 
The randomized animation names from `unique-keyframes` was not being picked up by the different servers which resulted in 404 errors.

## Screenshots (if relevant)
None

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [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 you do - 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 #22629

See merge request !6603

CE to EE merge check rake task

## What does this MR do?

This merge request adds a Rake task that checks whether the current branch can be merged cleanly to EE/master.

If not, it checks if a `<ce_branch>-ee` branch exists in EE, tries to merge it to EE/master and then tries to merge `ce_branch` to EE/master.

If the result of the check is that the current branch cannot be merged cleanly to EE/master, the job will fail, display troubleshooting steps, and a warning will be shown in the merge request.

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

Probably the steps I used to do the various checks, and also the steps I suggest to create an EE-specific branch.

## Why was this MR needed?

The goal is to catch as early as possible the possible conflicts a CE MR will cause when CE/master will be merged to EE/master. This way, the developer is warned that he/she should open a MR against EE before or as soon as the CE is merged. In the end, this should lower the work of the CE->EE merger.

## What are the relevant issue numbers?

Part of gitlab-org/gitlab-ee#715, hopefully.

See merge request !6746

Handle case where deployment ref no longer exists

## What does this MR do?

In 8.9, we didn't create keep-around refs for deployments. So it's possible that someone created a deployment (say, for testing), and then deleted the branch and all other references to that commit. That commit could then get GCed, and trying to view MRs on 8.11+ will show a 500. See https://gitlab.com/gitlab-org/gitlab-ce/issues/22655#note_16575020 for more details.

## Why was this MR needed?

If someone created a deployment on 8.9, then deleted all references to the commit for that deployment, we will throw an exception when checking if the deployment includes a commit.

Closes #22655.

See merge request !6855

Sort API mounts

## What does this MR do?

Sort the API mounts.

## Why was this MR needed?

The API mounts are unsorted.

See merge request !6831

Convert unicode emojis to images.

## Why was this MR needed?

For better cross platform interoperability with emojis.

Closes #22591

See merge request !6829

Also add a safeguard for non-CI env.
Signed-off-by: Rémy Coutable <remy@rymai.me>

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

Use defined colour for a language when available

## What does this MR do?

This MR changes the colours of the different languages in the language graph.  It now uses the colour set in Linguist instead of the first six characters of the SHA256'd language name where possible.  If Linguist has no colour defined for a given language, it falls back to the old method of finding a colour.

I talked with @connorshea about creating this MR [on Twitter](https://twitter.com/connorjshea/status/784390886222286849) a few hours earlier. Here's also an older [tweet from May](https://twitter.com/nilsding/status/737018807223496708) where we discussed some possible improvements to the graph. 

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

Hopefully none ;)

## Why was this MR needed?

Aesthetics.

## Screenshots (if relevant)

Before:

![language_colours_before](/uploads/6b4bac784860da746d58708bdd6bba39/language_colours_before.png)

After:

![language_colours_after](/uploads/98818ebf48ffb47e6b785120e69b0b6c/language_colours_after.png)

## 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
  - [ ] 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?

- #12455

See merge request !6748

Keep-around refs for deployments were only introduced in 8.10, so any
deployment created in 8.9 could have a SHA pointing to a commit that no
longer exists in the repository. We can't do anything useful with those
deployments, so make `#includes_commit?` always return false for those.

Loosen requirement on request_store version

This gem follows semantic versioning and will not introduce breaking
changes in a minor version. See
https://github.com/steveklabnik/request_store#semantic-versioning

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

See merge request !6853

Refactoring Issues Board

## What does this MR do?

This MR aims to minimize conflicts between the CE issues board feature with EE multiple boards feature.

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

## Why was this MR needed?

To avoid a lot of conflicts with EE multiple boards feature.

## 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)~~
- [x] 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)
- [ ] 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)

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ee/issues/929

https://gitlab.com/gitlab-org/gitlab-ee/issues/1084

See merge request !6727

Use forked github-markup gem to enable python3 support with omnibus

## What does this MR do?
Changes the version of `github-markup` gem we are using, to be the forked one with the changes to enable python3 support.
The change is backward compatible with users using Python 2, and will only be running with Python 3 in Omnibus (with the help of a custom patch we apply there).

## Are there points in the code the reviewer needs to double check?
Make sure backward compatibility isn't broken for source installs.

## For the release manager

You need to make sure you pickup into stable this merge request as well (for omnibus): https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1015 as it's part of the fix, otherwise package will fail to build.

## Why was this MR needed?
We had some regressions with .rst rendering that were fixed, but still some issues with encoding persisted (this MR will fix that). See: https://gitlab.com/gitlab-org/gitlab-ce/issues/21696

## 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
  - [ ] 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 you do - 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?

* gitlab-org/gitlab-ce#21696
* gitlab-org/gitlab-ce#22748
* gitlab-com/support-forum#1097

See merge request !6659

GrapeDSL for variables



See merge request !6838

Merge branch '23234-deleting-a-milestone-removes-source-branch-deletion-options-of-associated-merge-requests' into 'master'

Maintain "force_remove_source_branch" options on Merge Request unless specified

## What does this MR do?

Fixes a problem where Merge Requests were losing the state associated with the flag to remove the source branch upon merge

* Closes #23234 
* Closes #23191
* Closes #19351

See merge request !6817

Keep a copy of gems needed by our releases as CI artifacts

This is meant as insurance in case a gem GitLab needs is ever removed
from rubygems.org. After we merge this, all future GitLab tags will
have a CI artifact archive containing all the gems (for all platforms)
specified in Gemfile.lock for that revision.

Only runs on tags (so we don't constantly create 50MB gem cache bundles).

See merge request !6617

This gem follows semantic versioning and will not introduce breaking
changes in a minor version. See
https://github.com/steveklabnik/request_store#semantic-versioning

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

Add job to trigger a docs.gitlab.com build

## What does this MR do?

Add a job to build the docs site every time master tests pass.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-com/doc-gitlab-com/issues/56

See merge request !6850

Implement second iteration of cycle analytics - Change in data measurement

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

Measure everything that happened in the given time range, not only what's been pushed to production. With the exception of the staging and production stages.

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- 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)

See merge request !6798

Fix secret names in HA docs

See https://gitlab.com/gitlab-org/gitlab-ee/issues/1110#note_16854559. I don't think this needs a CHANGELOG item really.

See merge request !6845

Fixed default branch dropdown not converting to select2

## What does this MR do?

The LFS dropdown doesn't have the `data` attribute & it isn't needed because it doesn't hide/show any elements. This filters out the `<select>` without that attribute.

## What are the relevant issue numbers?

Closes #23200

See merge request !6810

Fix overflow to show grouped builds arrow

## What does this MR do?
Removes overflow style so that the arrow shows up again

## Screenshots (if relevant)
Before:   
![Screen_Shot_2016-10-11_at_9.11.55_AM](/uploads/92d2a0c34d2af050e58468c8d61f4cd3/Screen_Shot_2016-10-11_at_9.11.55_AM.png)
After:   
![Screen_Shot_2016-10-11_at_9.11.41_AM](/uploads/2c4c422a21fb6450d00ae638aef29d89/Screen_Shot_2016-10-11_at_9.11.41_AM.png)
Scrolling:   
![Screen_Shot_2016-10-11_at_9.40.36_AM](/uploads/e5b1e3125d881c5882cf199026110d48/Screen_Shot_2016-10-11_at_9.40.36_AM.png)

See merge request !6808

Trigger Merge When Pipeline Succeeds on pipeline event

## What does this MR do?

This MR is meant to improve merge when build succeeds triggers, which has an impact on performance.

- [x] Move Merge When Build Succeeds trigger from commit status to pipeline event
- [x] Drop support for triggering event for branches that include commit status submitted without branch (no longer relevant)
- [x] Perform Merge When Pipeline Succeeds asynchronously to improve performance and avoid race conditions
- [x] Add missing feature test that verifies if MWBS feature actually works and merges merge requests
- [x] Update the documentation to reflect change in the behavior

Moved to separate merge request:

- [ ] Rename Merge When Build Succeeds to Merge When Pipeline Succeeds
- [ ] Update documentation to reflect name change for this feature

## 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

See merge request !6675

Ensure that whitespace doesn't cause adding members to fail

I recently had to debug an issue where adding users wasn't working. It turned out that I was hitting "space" to confirm a `select2` dialog, and the server would throw out the whole email address because it was invalid. It looked as though GitLab was entirely ignoring my add-member request.

Here's a fun gif:
![out](/uploads/5c306addb764067bca54add3b7a53c6c/out.gif)

Ideally, there should also be validation client-side, so that the server doesn't need to silently fail, and the user will know what's going wrong. I'll look into creating an issue for that.

Additionally, GitLab already seems to trim email addresses, sometimes? If you add _two_ address, with spaces, then the `value` of the `user_ids` DOM element will have the first `n-1` addresses without spaces. Weird.

**TL;DR: Now spaces are always trimmed from new-member email addresses.**

See merge request !3443