diff options
author | blackst0ne <blackst0ne.ru@gmail.com> | 2018-04-08 15:35:30 +1100 |
---|---|---|
committer | blackst0ne <blackst0ne.ru@gmail.com> | 2018-04-08 15:35:30 +1100 |
commit | eddf3febd7e78a442a0b2fbd36d7b92ba769f4a5 (patch) | |
tree | 17ce078c15b18cf28a2c0e65afae1411935168cf /app/helpers/blob_helper.rb | |
parent | dd552d06f6e39d5e6138a33bd7c1bffb2d3dbb1d (diff) | |
download | gitlab-ce-eddf3febd7e78a442a0b2fbd36d7b92ba769f4a5.tar.gz |
[Rails5] Add `safe_params` helper
Rails 5.0 requires to explicitly permit attributes when building a URL
using current `params` object.
The `safe_params` helper allows developers to just call `safe_params.merge(...)`
instead of manually adding `permit` to every call.
https://github.com/rails/rails/pull/20868
Diffstat (limited to 'app/helpers/blob_helper.rb')
-rw-r--r-- | app/helpers/blob_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index 2b440e4d584..d89a54801f0 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -259,7 +259,7 @@ module BlobHelper options = [] if error == :collapsed - options << link_to('load it anyway', url_for(params.merge(viewer: viewer.type, expanded: true, format: nil))) + options << link_to('load it anyway', url_for(safe_params.merge(viewer: viewer.type, expanded: true, format: nil))) end # If the error is `:server_side_but_stored_externally`, the simple viewer will show the same error, |