Skip to content

Commit

Permalink
Merge pull request #974 from RickCarlino/master
Browse files Browse the repository at this point in the history
Dep Upgrades
  • Loading branch information
RickCarlino authored Nov 4, 2018
2 parents 4acd460 + de1f729 commit 20c0485
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
8 changes: 6 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ gem 'therubyracer', platforms: :ruby
gem 'uglifier', '>= 1.3.0'
gem 'utf8-cleaner'

# Can be removed after Rails upgrade.
# https://nvd.nist.gov/vuln/detail/CVE-2018-16468
gem 'loofah', '>= 2.2.3'

# Asset management using bower
# https://rails-assets.org/
source 'https://rails-assets.org' do
Expand Down Expand Up @@ -95,9 +99,9 @@ group :test do
end

group :development do
gem 'rubocop', '~> 0.49.0'
gem 'letter_opener'
gem 'rainbow', '~> 2.1.0' # https://github.com/sickill/rainbow/issues/48
gem "letter_opener"
gem 'rubocop', '~> 0.49.0'
end

group :production, :staging do
Expand Down
5 changes: 3 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ GEM
letter_opener (1.4.1)
launchy (~> 2.2)
libv8 (3.16.14.19)
loofah (2.2.2)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
Expand Down Expand Up @@ -815,7 +815,7 @@ GEM
activesupport
nested_form (0.3.2)
ng-rails-csrf (0.1.0)
nokogiri (1.8.3)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
optionable (0.2.0)
origin (2.3.1)
Expand Down Expand Up @@ -1072,6 +1072,7 @@ DEPENDENCIES
launchy
letsencrypt-rails-heroku
letter_opener
loofah (>= 2.2.3)
merit
mongoid (~> 4.0.2)
mongoid-history
Expand Down

0 comments on commit 20c0485

Please sign in to comment.