delta/gitlab/gitlab-ce.git/config/initializers, branch bootstrap-markdown-code-highlight

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`

better handle a missing gitlab-shell version

2018-05-30T16:52:36+00:00

Replace grape-route-helpers with our own grape-path-helpers

2018-05-30T10:15:03+00:00

This gem (https://gitlab.com/gitlab-org/grape-path-helpers) makes a number of changes:

1. Brings in @mdelaossa's changes in https://github.com/reprah/grape-route-helpers/pull/21
2. Fixes some broken specs and code for Grape 1.0+
3. Optimizes the generation of paths by bringing in @dblessing's
   HashWithIndifferentAccess changes in https://gitlab.com/gitlab-org/gitlab-ce/issues/45718#note_70123793

Closes #45718

Upgrade to Ruby 2.4.4

2018-05-29T22:19:33+00:00

Fixes that make this work:

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

Revise comments

2018-05-28T05:41:53+00:00