Remove fetch polyfill and other misc small fixes (forem#629)

* Remove fetch polyfill and other misc small fixes * Remove fetch polyfill and other misc small fixes
anonymous-security-public · Jul 27, 2018 · 749d61a · 749d61a
1 parent ce965bc
commit 749d61a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/Gemfile b/Gemfile
@@ -42,7 +42,6 @@ gem "envied", "~> 0.9"
 gem "fastly", "~> 1.13"
 gem "fastly-rails", "~> 0.8"
 gem "feedjira", "~> 2.1"
-gem "fetch-rails", "~> 1.0"
 gem "figaro", "~> 1.1"
 gem "flipflop", "~> 2.3"
 gem "fog", "~> 1.41"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -290,8 +290,6 @@ GEM
       faraday_middleware (>= 0.9)
       loofah (>= 2.0)
       sax-machine (>= 1.0)
-    fetch-rails (1.0.0)
-      rails (>= 4.1.0)
     ffi (1.9.25)
     figaro (1.1.1)
       thor (~> 0.14)
@@ -959,7 +957,6 @@ DEPENDENCIES
   fastly (~> 1.13)
   fastly-rails (~> 0.8)
   feedjira (~> 2.1)
-  fetch-rails (~> 1.0)
   figaro (~> 1.1)
   fix-db-schema-conflicts!
   flipflop (~> 2.3)

diff --git a/app/assets/javascripts/base.js.erb b/app/assets/javascripts/base.js.erb
@@ -6,7 +6,6 @@
 //= require airbrake-js-client
 //= require serviceworker-companion
 //= require algolia/v3/algoliasearch.min
-//= require fetch
 
 var instantClick
   , InstantClick = instantClick = function(document, location, $userAgent) {

diff --git a/app/models/reaction.rb b/app/models/reaction.rb
@@ -74,10 +74,10 @@ def update_reactable
     if reactable_type == "Article"
       reactable.async_score_calc
       reactable.index!
-      cache_buster.bust "/reactions/logged_out_reaction_counts?article_id=#{reactable_id}"
+      cache_buster.bust "/reactions?article_id=#{reactable_id}"
     elsif reactable_type == "Comment"
       reactable.save
-      cache_buster.bust "/reactions/logged_out_reaction_counts?commentable_id=#{reactable.commentable_id}&commentable_type=#{reactable.commentable_type}"
+      cache_buster.bust "/reactions?commentable_id=#{reactable.commentable_id}&commentable_type=#{reactable.commentable_type}"
     end
     cache_buster.bust user.path
     occasionally_sync_reaction_counts

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -34,8 +34,8 @@
       }
     </style>
 
-    <%= javascript_pack_tag "manifest" %>
-    <%= javascript_pack_tag "vendor" %>
+    <%= javascript_pack_tag "manifest", defer: true %>
+    <%= javascript_pack_tag "vendor", defer: true %>
 
     <%= javascript_pack_tag 'Search', defer: true %>
     <% if core_pages? %>