Enrich Security Reports with more data.

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

Update GitHub import instructions

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

Add additional Consul/Repmgr troubleshoot details

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

Merge branch '6011-geo-deleted-project-events-may-be-skipped-on-the-secondary-when-selective-sync-is-used' into 'master'

Resolve "Geo: Deleted project events may be skipped on the secondary when selective sync is used"

Closes #6011

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

Resolve "Extract EE specific files/lines for lib/gitlab/slash_commands"

Closes #6022

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

Add ability to search wiki titles

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

Create system note on epic date change

Closes #5477

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

Fix attr_encryption key settings (EE port)

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

CE upstream - 2018-06-04 07:27 UTC

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

update Bandit link

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

Update IPs to valid example IPs.

Closes #47197

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

As per: https://tools.ietf.org/html/rfc5737

Resolve "URI::InvalidURIError: bad URI(is not URI?): users/xxx[bot]"

Closes #47193

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

CE upstream - 2018-06-03 23:29 UTC

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

Update selenium-webdriver to 3.12.0

Closes #47183

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

Fix missing key change in 20171124104327_migrate_kubernetes_service_to_new_clusters_architectures.rb

attr_encrypted does different things with `key` depending on what mode you are using:

1. In `:per_attribute_iv_and_salt` mode, it generates a hash with the salt:
https://github.com/attr-encrypted/encryptor/blob/c3a62c4a9e74686dd95e0548f9dc2a361fdc95d1/lib/encryptor.rb#L77.
There is no need to truncate the key to 32 bytes here.

2. In `:per_attribute_iv` mode, it sets the key directly to the password, so
truncation to 32 bytes is necessary.

Closes #47166

Extract EE specific files, closes #5942

Closes #5942

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

CE upstream - 2018-06-02 00:23 UTC

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

Fix bootstrap 4 file inputs

Closes #46701

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

CE upstream - 2018-06-01 18:31 UTC

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

Add comment about the need for truncating keys in Ruby 2.4

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

Move creation of time logs before the update of the issue in the
setup. The introduction of `touch: true` in gitlab-org/gitlab-ce!19065
causes the timestamp to be updated.