delta/gitlab/gitlab-ce.git/config, branch github-import-docs

Fix attr_encryption key settings

2018-06-02T12:24:59+00:00

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

Add comment about the need for truncating keys in Ruby 2.4

2018-06-01T20:49:22+00:00

[ci skip]

Merge branch 'sh-bump-ruby-2.4' into 'master'

2018-06-01T17:59:04+00:00

Upgrade to Ruby 2.4.4

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

Add "deny disk access" Gitaly feature (tripswitch)

2018-06-01T11:56:29+00:00

Merge branch '46481-preserve-warnings-even-if-passed' into 'master'

2018-06-01T11:49:39+00:00

Resolve "A lot of constants redefinition warnings"

Closes #46481

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

Merge branch 'add-moneky-patch-for-using-stream-upload-with-carrierwave' into 'master'

2018-06-01T10:01:41+00:00

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

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

Introduce Gitlab::Auth.omniauth_setup_providers

2018-06-01T06:30:10+00:00

Which could extend from EE

Eliminate constants warnings by:

2018-06-01T05:46:46+00:00

* Replace `require` or `require_relative` with `require_dependency`
* Remove unneeded `autoload`

Update 404 and 403 pages

2018-05-31T21:28:19+00:00

Export assigned issues in iCalendar feed

2018-05-31T14:01:04+00:00