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

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

46733 move filter dropdown from font awesome to our own icons ee

Closes gitlab-ce#46733

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

# Conflicts:
#	doc/install/requirements.md
#	spec/views/help/index.html.haml_spec.rb

[ci skip]

Respect the user commit email in more places

Closes #51564

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

Add beta elasticsearch indexer to patch/upgrade docs

Closes #3671

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

Update database requirements documentation with more MySQL limitations

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

[EE Port] Update database requirements documentation with more MySQL limitations

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

CE upstream - 2018-09-18 00:23 UTC

Closes gitlab-ce#51530 and gitlab-ce#51585

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

Resolve conflict by keeping EE-specific changes

Use the `stub_licensed_features` helper in specs

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

Correct usage of the have_link matcher

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

Resolve "Open issues from archived project listed in group issue board"

Closes #45754

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

Resolve character encodings in CONTRIBUTING

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

Expose runners status information in job api

Closes #51273

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

# 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