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.

[ci skip]

Use RequestStore to memoize Flipper features so that memoized values are cleared between requests

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

# 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

https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/71887977 was failing
due to confusion between Ci::Group and Group.
https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/71887977

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

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