Conflicts:
	app/helpers/page_layout_helper.rb

Add temporary CANARY env vars to be set in Kubernetes-with-canary.gitlab-ci.yml and used in page_layout_helper.rb

Conflicts:
	app/helpers/page_layout_helper.rb

Add HA architecture examples

Closes #5368

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

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

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