CE upstream - 2018-10-05 09:21 UTC

Closes gitlab-ce#52235

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

EE needs :request_store to cache license queries - otherwise we will blow past
the query limit just with `SELECT * FROM licenses` over and over.

# Conflicts:
#	app/assets/javascripts/jobs/components/job_app.vue
#	app/assets/javascripts/jobs/store/getters.js
#	app/serializers/build_details_entity.rb
#	doc/api/merge_requests.md
#	locale/gitlab.pot
#	spec/javascripts/jobs/components/job_app_spec.js

[ci skip]

Removes icon key from job endpoint

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

Removes icon key from job endpoint

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

Adding qa-selectors for e2e tests

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

Documentation: Use proper Configure label instead of Configuration in issue_workflow.md

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

Use tiller directly for Auto DevOps

Closes #52143

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

CE upstream - 2018-10-04 10:35 UTC

Closes gitlab-ce#14249

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

Revert "Merge branch 'feature/git-v2-flag' into 'master'"

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

List public ssh keys by id or username without authentication

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

Add `Feature.enabled_and_licensed?`

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

[EE] Add `Feature.enabled_and_licensed?`

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

Allows to filter issues by `Any milestone` in the API

Closes #51748

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

Banzai label ref finder - minimize SQL calls by sharing context more aggresively

Closes #48221

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

Move include to prepended block to fix service desk emails

Closes #7846

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

We are checking project specific quota not at a namespace level so when a
group has a quota the limit was not being considered.

This reverts merge request !21520

Require spec helpers loaded by other spec helpers first

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

https://en.wikipedia.org/wiki/Nohup#Overcoming_hanging

https://gitlab.com/gitlab-org/gitlab-runner/issues/2880

This saves a external network call to fetch a helm plugin. The cost is a
few lines of shell script

EE backport: Add css class to Admin > Project > show page

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

Resolve "2FA mobile options should be rephrased"

Closes #40140

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

Trim whitespace when inviting a new user by email

Closes #52194

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