Skip to content

Commit

Permalink
Merge 2a93199 into 4836119
Browse files Browse the repository at this point in the history
  • Loading branch information
dependabot-preview[bot] committed Sep 30, 2019
2 parents 4836119 + 2a93199 commit c5c7884
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -20,7 +20,7 @@ gem 'pg_query', '>= 0.9.0'
gem 'pghero'
gem 'puma', '~> 3.12'
gem 'rack-cors'
gem 'sass-rails', '~> 5.0'
gem 'sass-rails', '~> 6.0'
gem 'sentry-raven'
gem 'sidekiq', '< 6'
gem 'skylight'
Expand Down
29 changes: 14 additions & 15 deletions Gemfile.lock
Expand Up @@ -149,7 +149,7 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.2.3)
loofah (2.3.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
Expand All @@ -162,7 +162,7 @@ GEM
mime-types-data (3.2019.0904)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.12.0)
minitest (5.12.2)
multi_xml (0.6.0)
multipart-post (2.1.1)
nenv (0.3.0)
Expand Down Expand Up @@ -259,7 +259,7 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
rake (12.3.3)
rake (13.0.0)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
Expand Down Expand Up @@ -315,17 +315,16 @@ GEM
sexp_processor (~> 4.9)
rugged (0.28.3.1)
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.2.1)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
Expand Down Expand Up @@ -445,7 +444,7 @@ DEPENDENCIES
rspec-benchmark
rspec-rails (~> 3.7)
rspec-sidekiq
sass-rails (~> 5.0)
sass-rails (~> 6.0)
sentry-raven
sidekiq (< 6)
skylight
Expand Down

0 comments on commit c5c7884

Please sign in to comment.