Resolve conflict by keeping EE-specific changes

# Conflicts:
#	app/views/profiles/keys/_key_details.html.haml

[ci skip]

Return a default commit email if migration has not completed

Closes #51530

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

QA: Fix: set initial password even if using admin credentials

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

Add a new scenario to add an SSH key, perform Git actions with it, and then remove the key

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

[EE] Add an SSH key and use it to clone and push

See merge request gitlab-org/gitlab-ee!6670

CE upstream - 2018-09-17 18:21 UTC

Closes gitlab-ce#51307 and gitlab-ce#51585

See merge request gitlab-org/gitlab-ee!7392

Fix haml-lint error in 2FA codes partial

Closes #51585

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

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

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

CE-EE parity for Markdown (Banzai) feature specs

Closes #6498

See merge request gitlab-org/gitlab-ee!6249

Allow UrlValidator to work with attr_encrypted

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

Sync commonmaker version in Gemfile.*.lock

Closes #51557

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

# Conflicts:
#	app/models/ci/runner.rb
#	app/models/project_authorization.rb
#	app/models/user.rb

[ci skip]

commonmaker was update in Gemfile.lock only

Extract EE specific code to EE::SortingHelper

See merge request gitlab-org/gitlab-ee!7389

Moves EE-specific GFM tests (in this case, just Epic references) into
the `ee/` path.

This default will be overridden in the EE-specific subclass that uses a
different fixture path.

Add fixture path argument to `MarkdownFeature.new`

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

Replace direct use of Gitlab::SQL::Union with a "from_union" method

Closes #51307

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

EE: Replace direct use of Gitlab::SQL::Union with a "from_union" method

Closes gitlab-ce#51307

See merge request gitlab-org/gitlab-ee!7384

CE upstream - 2018-09-17 15:31 UTC

Closes gitlab-ce#51093

See merge request gitlab-org/gitlab-ee!7387

Add Gitaly diff stats RPC client

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

Extend JUnit XML test report documentation to explicitly mention support for filename patterns.

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

Decouple file row from IDE

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

Add 2fa button

Closes #47963

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

Update Contribution guidelines via new community contribution flow

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

This adds a basic interface to fetch diff statistics given two SHAs.
It's a requirement for #49399 #20282 and #19232.

Resolve "Add runner JSON schema"

Closes #51093

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

CE upstream - 2018-09-17 12:35 UTC

Closes gitlab-ce#50460, gitlab-ce#50461, #7019, gitlab-qa#323, gitlab-workhorse#181, and gitlab-org/release/framework#13

See merge request gitlab-org/gitlab-ee!7385

Add CI_JOB_TOKEN support to Maven docs

See merge request gitlab-org/gitlab-ee!7379