Merge pull request #4255 from MarkUsProject/dependabot/bundler/sprock…

…ets-4.0.0 build(deps): bump sprockets from 3.7.2 to 4.0.0
MarkUsProject · Dec 9, 2019 · 07064fc · 07064fc
2 parents 2f7401d + e64a968
commit 07064fc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -315,7 +315,7 @@ GEM
       rack (~> 2.0)
       rack-protection (= 2.0.4)
       tilt (~> 2.0)
-    sprockets (3.7.2)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -1,6 +1,6 @@
 //= link_tree ../javascripts .js
 //= link_directory ../stylesheets .css
-//= link common/SyntaxHighlighter.scss
+//= link common/SyntaxHighlighter.css
 
 //= link_tree ../../../vendor/assets/javascripts .js
 //= link_tree ../../../vendor/assets/stylesheets .css

diff --git a/config/application.rb b/config/application.rb
@@ -46,8 +46,6 @@ class Application < Rails::Application
     config.assets.quiet = true
     # Add Yarn node_modules folder to the asset load path.
     config.assets.paths << Rails.root.join('node_modules')
-    # Precompile additional assets.
-    config.assets.precompile = %w(manifest.js)
 
     # Configure responders gem flash keys.
     # NOTE: This didn't work when put in config/initializers/responders.rb.