Skip to content

Commit

Permalink
Merge pull request #421 from DanielAmah/update-sprocket-rails-gem
Browse files Browse the repository at this point in the history
update sprocket gem to handle vulnerability issues
  • Loading branch information
tarzan authored Sep 11, 2018
2 parents 955b74d + 0fbdd2d commit df352f1
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ gem "paperclip", "~> 5.1.0"
gem "aws-sdk"
gem "redcarpet"
gem "holidays"
gem "sprockets-rails", "~> 2.3"
gem "sprockets-rails", "~>3.0"
gem "brakeman"

source "https://rails-assets.org" do
Expand Down
34 changes: 17 additions & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ GEM
concurrent-ruby (1.0.5)
crack (0.4.2)
safe_yaml (~> 1.0.0)
crass (1.0.3)
crass (1.0.4)
dalli (2.7.0)
database_cleaner (1.3.0)
debug_inspector (0.0.2)
Expand Down Expand Up @@ -694,7 +694,7 @@ GEM
highline (1.7.8)
holidays (1.2.0)
http_accept_language (2.0.1)
i18n (0.9.1)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jmespath (1.3.1)
jquery-atwho-rails (1.3.2)
Expand All @@ -711,7 +711,7 @@ GEM
addressable (~> 2.3)
letter_opener (1.2.0)
launchy (~> 2.2)
loofah (2.2.1)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
Expand All @@ -724,15 +724,15 @@ GEM
mimemagic (0.3.2)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.10.3)
minitest (5.11.3)
momentjs-rails (2.7.0)
railties (>= 3.1)
multi_json (1.11.2)
neat (1.5.1)
bourbon (>= 3.1)
sass (~> 3.2.19)
newrelic_rpm (3.9.0.229)
nokogiri (1.8.2)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
normalize-rails (3.0.1)
orm_adapter (0.5.0)
Expand All @@ -751,7 +751,7 @@ GEM
slop (~> 3.4)
pry-rails (0.3.2)
pry (>= 0.9.10)
rack (1.6.8)
rack (1.6.10)
rack-test (0.6.3)
rack (>= 1.0)
rack-timeout (0.0.4)
Expand All @@ -769,12 +769,12 @@ GEM
rails-assets-chartjs (1.0.1)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-observers (0.1.2)
activemodel (~> 4.0)
rails_12factor (0.0.2)
Expand Down Expand Up @@ -845,13 +845,13 @@ GEM
spring (1.1.3)
spring-commands-rspec (1.0.2)
spring (>= 0.9.1)
sprockets (3.7.1)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
temple (0.7.6)
terminal-table (1.5.2)
thor (0.19.4)
Expand All @@ -863,7 +863,7 @@ GEM
rails (>= 3.1)
twitter-text (1.9.2)
unf (~> 0.1.0)
tzinfo (1.2.4)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.0.2)
execjs (>= 0.3.0, < 3)
Expand Down Expand Up @@ -944,7 +944,7 @@ DEPENDENCIES
simplecov
spring
spring-commands-rspec
sprockets-rails (~> 2.3)
sprockets-rails (~> 3.0)
timecop
title
twitter-text
Expand Down
1 change: 1 addition & 0 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,6 @@ class Application < Rails::Application
# config.i18n.default_locale = :de
config.secret_token = ENV["SECRET_TOKEN"]
config.active_record.raise_in_transactional_callbacks = true
config.assets.precompile << %w(landing.css)
end
end

0 comments on commit df352f1

Please sign in to comment.