diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-08-11 14:36:40 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-08-11 14:36:40 +0000 |
| commit | 4c29c25497c9a20a5d1f57cd287123cd41edad96 (patch) | |
| tree | a9eda345190f046c80456e4979973f3489ddfa21 /config/initializers | |
| parent | 7e9b41896d8c2ffae36152401f35479b39297e78 (diff) | |
| parent | 6e6ad3e2fc386044134cbb33395cceb97e913fa0 (diff) | |
| download | gitlab-ce-4c29c25497c9a20a5d1f57cd287123cd41edad96.tar.gz | |
Merge branch 'remove-grack-lfs' into 'master'
Remove Grack::Auth: part 2 (LFS)
Deprecate Grack::Auth and handle LFS in Rails controllers under the Project namespace.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14501
See merge request !5369
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/5_backend.rb | 3 | ||||
| -rw-r--r-- | config/initializers/mime_types.rb | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/config/initializers/5_backend.rb b/config/initializers/5_backend.rb index e026151a032..ed88c8ee1b8 100644 --- a/config/initializers/5_backend.rb +++ b/config/initializers/5_backend.rb @@ -1,6 +1,3 @@ -# GIT over HTTP -require_dependency Rails.root.join('lib/gitlab/backend/grack_auth') - # GIT over SSH require_dependency Rails.root.join('lib/gitlab/backend/shell') diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb index 3e553120205..f498732feca 100644 --- a/config/initializers/mime_types.rb +++ b/config/initializers/mime_types.rb @@ -12,3 +12,10 @@ Mime::Type.register_alias "text/html", :md Mime::Type.register "video/mp4", :mp4, [], [:m4v, :mov] Mime::Type.register "video/webm", :webm Mime::Type.register "video/ogg", :ogv + +middlewares = Gitlab::Application.config.middleware +middlewares.swap(ActionDispatch::ParamsParser, ActionDispatch::ParamsParser, { + Mime::Type.lookup('application/vnd.git-lfs+json') => lambda do |body| + ActiveSupport::JSON.decode(body) + end +}) |