From ac24a034825b248dcc4a34db720e8993ec646fe0 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Shibuya Date: Mon, 29 Jan 2024 19:06:34 +0900 Subject: [PATCH 1/2] Fix ruby-head build https://github.com/carrierwaveuploader/carrierwave/pull/2721#issuecomment-1910671012 --- carrierwave.gemspec | 1 + gemfiles/rails-7-1.gemfile | 1 + 2 files changed, 2 insertions(+) diff --git a/carrierwave.gemspec b/carrierwave.gemspec index 6d97a0a10..cc1ec0d9b 100644 --- a/carrierwave.gemspec +++ b/carrierwave.gemspec @@ -26,6 +26,7 @@ Gem::Specification.new do |s| s.add_dependency "marcel", "~> 1.0.0" s.add_dependency "addressable", "~> 2.6" s.add_dependency "ssrf_filter", "~> 1.0" + s.add_development_dependency "csv", "~> 3.0" s.add_development_dependency "cucumber", "~> 2.3" s.add_development_dependency "rspec", "~> 3.4" s.add_development_dependency "rspec-retry" diff --git a/gemfiles/rails-7-1.gemfile b/gemfiles/rails-7-1.gemfile index cb50e6cb7..582ea0066 100644 --- a/gemfiles/rails-7-1.gemfile +++ b/gemfiles/rails-7-1.gemfile @@ -4,5 +4,6 @@ gem "rails", "~> 7.1.0" gem "activemodel-serializers-xml" gem 'sqlite3', platforms: :ruby gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby, :truffleruby] +gem "observer" # Workaround for https://github.com/rmagick/rmagick/pull/1411 gemspec :path => "../" From 7b37d56ec22bfb684e7ed7c8fcf38df8202a03c9 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Shibuya Date: Mon, 29 Jan 2024 19:25:43 +0900 Subject: [PATCH 2/2] Add documentation for supporting S3 with ACLs disabled and GCS uniform bucket-level access Closes #2634, Closes #2664, Closes #2666, Closes #2667, Closes #2709 --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 6807ca1a7..08bda8b24 100644 --- a/README.md +++ b/README.md @@ -769,6 +769,10 @@ CarrierWave.configure do |config| config.fog_directory = 'name_of_bucket' # required config.fog_public = false # optional, defaults to true config.fog_attributes = { cache_control: "public, max-age=#{365.days.to_i}" } # optional, defaults to {} + # Use this if you have AWS S3 ACLs disabled. + # config.fog_attributes = { 'x-amz-acl' => 'bucket-owner-full-control' } + # Use this if you have Google Cloud Storage uniform bucket-level access enabled. + # config.fog_attributes = { uniform: true } # For an application which utilizes multiple servers but does not need caches persisted across requests, # uncomment the line :file instead of the default :storage. Otherwise, it will use AWS as the temp cache store. # config.cache_storage = :file