Skip to content

Commit

Permalink
Merge pull request #3459 from manyfold3d/s3-path-params
Browse files Browse the repository at this point in the history
Fix s3 path-style parameter filtering
  • Loading branch information
Floppy authored Jan 21, 2025
2 parents 0cb5f92 + a3e7906 commit 4ed4083
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/admin/libraries.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

actions :all, except: [:new]
permit_params :path, :name, :notes, :caption, :icon, :storage_service,
:s3_endpoint, :s3_bucket, :s3_access_key_id, :s3_secret_access_key, :s3_region, tag_regex: []
:s3_endpoint, :s3_bucket, :s3_access_key_id, :s3_secret_access_key, :s3_region, :s3_path_style, tag_regex: []

Library.ransackable_symbols.each { |it| filter it }

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/libraries_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def destroy
def library_params
params.require(:library).permit(
:path, :name, :notes, :caption, :icon, {tag_regex: []}, :storage_service,
:s3_endpoint, :s3_bucket, :s3_region, :s3_access_key_id, :s3_secret_access_key
:s3_endpoint, :s3_bucket, :s3_region, :s3_access_key_id, :s3_secret_access_key, :s3_path_style
)
end

Expand Down

0 comments on commit 4ed4083

Please sign in to comment.