Port to EE: Ci/lint should support `include` keyword

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

Exclude 'db:rollback-pg-geo' job from docs pipelines

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

Add a merge strategy for `VERSION` to automatically use EE version

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

Don't retry ee-files-location-check

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

Resolve "Group security issues panels in the MR widget"

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

Clean the test path after each spec run

Closes #5461

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

FactoryBot's build_stubbed ignores the current database sequence of the
projects table and starts at ID 1000. If more than 1000 projects are created
during a test run, leftover repositories can cause spec failures. For example,
a spec that expects an empty repository may fail since there may be existing
content.

Closes #5461

Geo ensure files moved to object storage are cleaned up

Closes #4215

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

Docs: improve readability of Prometheus metrics

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

CE upstream - 2018-03-27 12:27 UTC

Closes #4171, #4163, #3370, and #2841

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

Add HA architecture examples

Closes #5368

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

* master: (54 commits)
  Count of verified wikis is incorrect on Geo secondary
  Remove out-of-context change.
  Resolve CE/EE conflicts related to pipeline seeds
  Document mutual TLS values on settings form
  Validate all credentials used for Mutual TLS
  Document TLS auth for external authorization
  TLS Client auth for external authorization service
  Add fields for credentials for external auth TLS
  Fix LDAP login without user in DB
  Fix unapproved unassigned MR email erroring out
  Put forms from expandable sections into fieldset to ensure proper animation
  Add CHANGELOG
  Perform the repository verification per shard on a secondary node
  Remove gray background from app setting expandable sections
  Improve application settings page according to feedback
  Improves User#owned_projects query performance
  Add test for new README.md in docs
  remove some lint
  personal snippets will now comply with `background_upload`
  Send notification emails when push to a merge request
  ...

Fix unapproved unassigned merge request e-mails failing

Closes #3092

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

Resolve "Geo - Repository verification per shard on secondary node"

Closes #5309 and #5175

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

Count of verified wikis is incorrect on Geo secondary

Closes #5178

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

# Conflicts:
#	CHANGELOG.md
#	spec/services/clusters/create_service_spec.rb

[ci skip]

40781 Port to EE

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

'Assigned Issues' and 'Assigned Merge Requests' as dashboard user choices

Closes #42180

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

Allow TLS authentication for the external authorization service

Closes #4838

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

CE upstream - 2018-03-27 08:13 UTC

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

* master: (61 commits)
  Update CHANGELOG.md for 10.6.1
  Update CHANGELOG-EE.md for 10.6.1-ee
  Put forms from expandable sections into fieldset to ensure proper animation
  Remove gray background from app setting expandable sections
  Improve application settings page according to feedback
  Fix failing spec in ee/spec/controllers/projects/variables_controller_spec.rb
  Prevent unnecessary, excessive updates
  Re-arrange deployment_platform to avoid cop complainments
  Make #base_pipeline returning the latest available pipeline for MR's base commit
  fix conflict
  Bump `state_machines-activerecord` to `0.5.1`
  Docs organize main page by product category
  ProtectedBranch API omits empty declared params
  Fix deployment_platform not memoizing values in correct way
  Move UI of several application settings to expandable block
  add SHA1 fingerprint requirement
  Make stage seed instance variables less ambiguous
  Remove outdates TODOs from pipeline class
  Remove N+1 query for Noteable association.
  Disable cursor for review mode in the IDE
  ...

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

Redesign application settings to match project settings (part 1)

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

[ci skip]

[ci skip]

[ci skip]

Make all workhorse gitaly calls opt-out

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

Fixed typos

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

Add a test to make sure there's no XSS for hook logs

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