Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump carrierwave from 3.0.5 to 3.0.7 #9634

Merged
merged 2 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
carrierwave (3.0.5)
carrierwave (3.0.7)
activemodel (>= 6.0.0)
activesupport (>= 6.0.0)
addressable (~> 2.6)
Expand Down Expand Up @@ -360,7 +360,7 @@ GEM
rails-i18n
rainbow (>= 2.2.2, < 4.0)
terminal-table (>= 1.5.1)
image_processing (1.12.2)
image_processing (1.13.0)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
inline_svg (1.10.0)
Expand Down Expand Up @@ -890,8 +890,9 @@ GEM
rubocop (~> 1.61)
ruby-progressbar (1.13.0)
ruby-rc4 (0.1.5)
ruby-vips (2.2.0)
ruby-vips (2.2.2)
ffi (~> 1.12)
logger
ruby2_keywords (0.0.5)
rubyntlm (0.6.5)
base64
Expand Down Expand Up @@ -954,7 +955,7 @@ GEM
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
ssrf_filter (1.1.2)
ssrf_filter (1.2.0)
statsd-ruby (1.5.0)
stringio (3.1.2)
sync (0.5.0)
Expand Down
2 changes: 1 addition & 1 deletion app/models/call_for_evidence_response_form_data.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ def filename
end

def assets_match_updated_image_filename
assets.reject { |asset| asset.filename.include?(carrierwave_file) }.empty?
assets.all? { |asset| asset.filename.include?(filename) } if filename
end
end
6 changes: 1 addition & 5 deletions app/models/consultation_response_form_data.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ class ConsultationResponseFormData < ApplicationRecord
as: :assetable,
inverse_of: :assetable

has_many :assets,
as: :assetable,
inverse_of: :assetable

validates :file, presence: true

def auth_bypass_ids
Expand All @@ -30,6 +26,6 @@ def filename
end

def assets_match_updated_image_filename
assets.reject { |asset| asset.filename.include?(carrierwave_file) }.empty?
assets.all? { |asset| asset.filename.include?(filename) } if filename
end
end
4 changes: 1 addition & 3 deletions app/models/featured_image_data.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ def republish_on_assets_ready
private

def assets_match_updated_image_filename
return false unless carrierwave_image

assets.all? { |asset| asset.filename.include?(carrierwave_image) }
assets.all? { |asset| asset.filename.include?(filename) } if filename
end
end
2 changes: 1 addition & 1 deletion app/models/promotional_feature_item.rb
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ def republish_organisation
end

def assets_match_updated_image_filename
assets.reject { |asset| asset.filename.include?(self[:image]) }.empty?
assets.all? { |asset| asset.filename.include?(self[:image]) } if self[:image]
end
end