* 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

40781 Port to EE

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

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]

Use `NOTE:` `CAUTION:` markup

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

Resolve "Multiple clusters: incorrect cluster details injected - environment scope is ignored"

Closes #5347

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

# Conflicts:
#	app/models/ci/pipeline.rb
#	app/services/ci/create_pipeline_service.rb
#	app/services/ci/pipeline_trigger_service.rb
#	app/views/admin/application_settings/_form.html.haml
#	spec/features/admin/admin_settings_spec.rb
#	spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
#	spec/models/ci/pipeline_spec.rb

[ci skip]

CE upstream - 2018-03-26 15:28 UTC

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

Fix LDAP login without user in DB

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

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

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

* Replace btn-save with btn-success
* Add id to each section so it can be directly linked
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Using this we validate that
- The certificate is valid
- The private key is valid
- The passphrase decrypts the private key
- The private key matches the certificate

By validating this up front the user doesn't need to validate this
using trail and error.

This allows an admin to provide a client certificate and private key
to perform TLS client authentication on the external authorization
service.

Optionally a passphrase for the key can be provided.

Add test for new README.md in docs

Closes #44647

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

EE fixes for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17796

Prevent unnecessary, excessive updates

Closes #5432

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

Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/3092

Make #base_pipeline returning the latest available pipeline for MR's base commit

Closes #5384

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

Redesign application settings to match project settings (part 1)

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