Skip to content

Commit

Permalink
Merge 67a7e4f into 2641cfc
Browse files Browse the repository at this point in the history
  • Loading branch information
dependabot-preview[bot] committed Aug 19, 2019
2 parents 2641cfc + 67a7e4f commit 5218037
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -45,7 +45,7 @@ gem 'sentry-raven'

group :assets do
gem 'autoprefixer-rails', '~> 9.6'
gem 'sass-rails', '~> 5.0'
gem 'sass-rails', '~> 6.0'
gem 'coffee-rails', '~> 4.2.0'
gem 'jquery-rails'

Expand Down
28 changes: 14 additions & 14 deletions Gemfile.lock
Expand Up @@ -257,7 +257,7 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2)
rails-i18n (5.1.3)
i18n (>= 0.7, < 2)
Expand All @@ -272,7 +272,7 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
rake (12.3.2)
rake (12.3.3)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
Expand Down Expand Up @@ -321,17 +321,17 @@ GEM
ruby-progressbar (1.10.1)
ruby_dep (1.5.0)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.0.1)
ffi (~> 1.9)
rake
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
sentry-raven (2.11.0)
faraday (>= 0.7.6, < 1.0)
shellany (0.0.1)
Expand Down Expand Up @@ -437,7 +437,7 @@ DEPENDENCIES
rspec-rails
rubocop (~> 0.58.1)
rubocop-rspec (~> 1.29)
sass-rails (~> 5.0)
sass-rails (~> 6.0)
sentry-raven
simplecov
simplecov-rcov
Expand Down

0 comments on commit 5218037

Please sign in to comment.