CE upstream - 2018-06-01 12:25 UTC

Closes gitaly#1210

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

Upgrade to Ruby 2.4.4 (EE port)

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

* A change in Ruby (https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1)
requires passing in the exact required length for OpenSSL keys and IVs.

* Ensure the secrets.yml is generated before any prepended modules are
loaded. This is done by renaming the `secret_token.rb` initializer to
`01_secret_token.rb`, which is a bit ugly but involves the least impact on
other files.

* Reading an invalid OpenSSL::PKey causes OpenSSL to throw OpenSSL::PKey::PKeyError
instead of ArgumentError (https://github.com/ruby/openssl/blob/master/History.md).

Part of "Extract EE specific files/lines for app/views/shared/issuable"

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

EE: Improve runner_type validations for Ci::Runner

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

# Conflicts:
#	app/assets/javascripts/api.js
#	doc/administration/auth/ldap.md
#	lib/gitlab/auth.rb

[ci skip]

Add "deny disk access" Gitaly feature (tripswitch)

Closes gitaly#1210

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

EE: Resolve "A lot of constants redefinition warnings"

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

Resolve "A lot of constants redefinition warnings"

Closes #46481

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

Remove 'GitLab' from user preferences header

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

Add validation to webhook and service URLs to ensure they are not blocked because of SSRF

Closes #45059

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

Add validation to webhook and service URLs to ensure they are not blocked because of SSRF

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

Truncate Geo event log with a delay

Closes #6221

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

Resolve "Strike through the whole line when vulnerability is dismissed"

Closes #6005

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

Resolve "ActiveRecord::RecordInvalid: Validation failed: Build timeout needs to be at least 10 minutes"

Closes #46019

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

Docs: fix typo

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

Docs: fix typo

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

Docs: fix typo

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

Refactor LDAP docs

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

Refactor LDAP docs

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

Add a monkey patch of https://github.com/carrierwaveuploader/carrierwave/pull/2314

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

Resolve "Unmergeable merge request notification text interpolation"

Closes #46840

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

CE upstream - 2018-05-31 21:32 UTC

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

Show CI jobs in IDE

Closes #44604

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

EE port of ide-jobs-list-components

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

Upgrade worker-loader dependency to remove deprecation warnings

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