Skip to content

Commit

Permalink
Bump Rails to 6.0.3.7 for CVE fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mbarnett
mbarnett committed May 5, 2021
1 parent 128d912 commit fbd3ae3
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 72 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
# Core Rails stuff
gem 'image_processing' # for ActiveStorage Variants
gem 'puma', '~> 5.1'
gem 'rails', '~> 6.0.3'
gem 'rails', '~> 6.0.3.7'

# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
gem 'webpacker', '~> 5.2'
Expand Down
136 changes: 68 additions & 68 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,63 +35,63 @@ GEM
specs:
aasm (5.1.1)
concurrent-ruby (~> 1.0)
actioncable (6.0.3.4)
actionpack (= 6.0.3.4)
actioncable (6.0.3.7)
actionpack (= 6.0.3.7)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.3.4)
actionpack (= 6.0.3.4)
activejob (= 6.0.3.4)
activerecord (= 6.0.3.4)
activestorage (= 6.0.3.4)
activesupport (= 6.0.3.4)
actionmailbox (6.0.3.7)
actionpack (= 6.0.3.7)
activejob (= 6.0.3.7)
activerecord (= 6.0.3.7)
activestorage (= 6.0.3.7)
activesupport (= 6.0.3.7)
mail (>= 2.7.1)
actionmailer (6.0.3.4)
actionpack (= 6.0.3.4)
actionview (= 6.0.3.4)
activejob (= 6.0.3.4)
actionmailer (6.0.3.7)
actionpack (= 6.0.3.7)
actionview (= 6.0.3.7)
activejob (= 6.0.3.7)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.3.4)
actionview (= 6.0.3.4)
activesupport (= 6.0.3.4)
actionpack (6.0.3.7)
actionview (= 6.0.3.7)
activesupport (= 6.0.3.7)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.3.4)
actionpack (= 6.0.3.4)
activerecord (= 6.0.3.4)
activestorage (= 6.0.3.4)
activesupport (= 6.0.3.4)
actiontext (6.0.3.7)
actionpack (= 6.0.3.7)
activerecord (= 6.0.3.7)
activestorage (= 6.0.3.7)
activesupport (= 6.0.3.7)
nokogiri (>= 1.8.5)
actionview (6.0.3.4)
activesupport (= 6.0.3.4)
actionview (6.0.3.7)
activesupport (= 6.0.3.7)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
active_link_to (1.0.5)
actionpack
addressable
activejob (6.0.3.4)
activesupport (= 6.0.3.4)
activejob (6.0.3.7)
activesupport (= 6.0.3.7)
globalid (>= 0.3.6)
activemodel (6.0.3.4)
activesupport (= 6.0.3.4)
activemodel (6.0.3.7)
activesupport (= 6.0.3.7)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord (6.0.3.4)
activemodel (= 6.0.3.4)
activesupport (= 6.0.3.4)
activestorage (6.0.3.4)
actionpack (= 6.0.3.4)
activejob (= 6.0.3.4)
activerecord (= 6.0.3.4)
marcel (~> 0.3.1)
activesupport (6.0.3.4)
activerecord (6.0.3.7)
activemodel (= 6.0.3.7)
activesupport (= 6.0.3.7)
activestorage (6.0.3.7)
actionpack (= 6.0.3.7)
activejob (= 6.0.3.7)
activerecord (= 6.0.3.7)
marcel (~> 1.0.0)
activesupport (6.0.3.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand Down Expand Up @@ -139,7 +139,7 @@ GEM
clamby (1.6.6)
coderay (1.1.3)
colored2 (3.1.2)
concurrent-ruby (1.1.7)
concurrent-ruby (1.1.8)
connection_pool (2.2.3)
cork (0.3.0)
colored2 (~> 3.1)
Expand Down Expand Up @@ -180,7 +180,7 @@ GEM
rainbow
rubocop (~> 0.79)
smart_properties
erubi (1.9.0)
erubi (1.10.0)
et-orbi (1.2.4)
tzinfo
ezid-client (1.8.0)
Expand Down Expand Up @@ -208,7 +208,7 @@ GEM
hashie (3.6.0)
html_tokenizer (0.0.7)
htmlentities (4.3.4)
i18n (1.8.5)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
image_processing (1.12.1)
mini_magick (>= 4.9.5, < 5)
Expand Down Expand Up @@ -239,19 +239,17 @@ GEM
listen (3.3.3)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.7.0)
loofah (2.9.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
marcel (1.0.1)
method_source (1.0.0)
mimemagic (0.3.5)
mini_magick (4.11.0)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.14.2)
mini_mime (1.1.0)
mini_portile2 (2.5.1)
minitest (5.14.4)
msgpack (1.3.3)
multipart-post (2.1.1)
mustermann (1.1.1)
Expand All @@ -260,10 +258,11 @@ GEM
nap (1.1.0)
net-http-persistent (3.1.0)
connection_pool (~> 2.2)
nio4r (2.5.4)
nio4r (2.5.7)
no_proxy_fix (0.1.2)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nokogiri (1.11.3)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
octokit (4.19.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
Expand Down Expand Up @@ -298,41 +297,42 @@ GEM
pundit (1.1.0)
activesupport (>= 3.0.0)
raabro (1.3.1)
racc (1.5.2)
rack (2.2.3)
rack-protection (2.1.0)
rack
rack-proxy (0.6.5)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.0.3.4)
actioncable (= 6.0.3.4)
actionmailbox (= 6.0.3.4)
actionmailer (= 6.0.3.4)
actionpack (= 6.0.3.4)
actiontext (= 6.0.3.4)
actionview (= 6.0.3.4)
activejob (= 6.0.3.4)
activemodel (= 6.0.3.4)
activerecord (= 6.0.3.4)
activestorage (= 6.0.3.4)
activesupport (= 6.0.3.4)
rails (6.0.3.7)
actioncable (= 6.0.3.7)
actionmailbox (= 6.0.3.7)
actionmailer (= 6.0.3.7)
actionpack (= 6.0.3.7)
actiontext (= 6.0.3.7)
actionview (= 6.0.3.7)
activejob (= 6.0.3.7)
activemodel (= 6.0.3.7)
activerecord (= 6.0.3.7)
activestorage (= 6.0.3.7)
activesupport (= 6.0.3.7)
bundler (>= 1.3.0)
railties (= 6.0.3.4)
railties (= 6.0.3.7)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (6.0.3.4)
actionpack (= 6.0.3.4)
activesupport (= 6.0.3.4)
railties (6.0.3.7)
actionpack (= 6.0.3.7)
activesupport (= 6.0.3.7)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
rainbow (3.0.0)
rake (13.0.1)
rake (13.0.3)
ransack (2.4.0)
activerecord (>= 5.2.4)
activesupport (>= 5.2.4)
Expand Down Expand Up @@ -462,10 +462,10 @@ GEM
rdf (~> 3.1)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thor (1.0.1)
thor (1.1.0)
thread_safe (0.3.6)
tilt (2.0.10)
tzinfo (1.2.8)
tzinfo (1.2.9)
thread_safe (~> 0.1)
unicode-display_width (1.7.0)
uuidtools (2.2.0)
Expand Down Expand Up @@ -542,7 +542,7 @@ DEPENDENCIES
pry-rails
puma (~> 5.1)
pundit (= 1.1.0)
rails (~> 6.0.3)
rails (~> 6.0.3.7)
ransack
rdf (~> 3.1.7)
rdf-isomorphic (~> 3.1.0)
Expand Down
2 changes: 0 additions & 2 deletions app/helpers/page_layout_helper.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ def thumbnail_path(logo, args = { resize_to_limit: [100, 100], auto_orient: true

Rails.application.routes.url_helpers.rails_representation_path(logo.representation(args).processed)
rescue StandardError => e
logger.warn("#{logo.record_type} with id: #{logo.record_id} and thumbnail #{logo.name} threw an error.")
Rollbar.warn("#{logo.record_type} with id: #{logo.record_id} and thumbnail #{logo.name} threw an error.", e)
nil
end

Expand Down
2 changes: 1 addition & 1 deletion lib/jupiter/version.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Jupiter
VERSION = '2.0.2'.freeze
VERSION = '2.0.3'.freeze
end

0 comments on commit fbd3ae3

Please sign in to comment.