# Conflicts:
#	spec/models/concerns/has_variable_spec.rb
#	spec/requests/api/runner_spec.rb

[ci skip]

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

Upgrade to Ruby 2.4.4

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

Revert "Merge branch '46833-sticky-polyfill' into 'master'"

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

Resolve "Branch names in system notes have incorrect color"

Closes #46696

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

Bump omniauth-gitlab to 1.0.3

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

* 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).

This reverts merge request !19304

Adds "the" to the new label page to correct the sentence.

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

Update position sticky polyfill

Closes #46833

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

This version of the gem uses API v4 by default:

https://github.com/linchus/omniauth-gitlab/commit/fd13de9f251fdaa72ba0195bda47cd2cb8731084

Resolve "Modal header styling is broken"

Closes #47113

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

Update FE guides with dependency/devDependency distinction

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

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

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

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

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

Resolve "The font is too bold in Issue events tab on Activity page"

Closes #46619

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

Resolve "Update `updated_at` on an issue/mr on every issue/mr changes"

Closes #46478

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

Resolve "Admin area > Monitoring > Logs > No default active tab"

Closes #46815

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

Make http_io honor HTTP(S)_PROXY environment.

Closes #46968 and #46982

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

ReactiveCaching#clear_reactive_cache! should not keep the cache alive

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

Merge branch '46913-appearance-uploader-fields-and-description-html-are-missing-in-cached-version' into 'master'

Resolve "Appearance uploader fields and description HTML are missing in cached version"

Closes #46913

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

Show merge requests in web IDE

Closes #45184

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

Use File.join in DeleteAllRepositories test

Closes #47108

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

Improve validations for Ci::Runner#runner_type

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

EE: Improve runner_type validations for Ci::Runner

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