v3.2.1

Merge pull request #817 from TechforgoodCAST/develop
TechforgoodCAST · Feb 19, 2019 · 17fda25 · 17fda25
2 parents 168b17e + 4ac0830
commit 17fda25
Show file tree

Hide file tree

Showing 3 changed files with 1,508 additions and 267 deletions.
diff --git a/app/views/shared/_head.html.haml b/app/views/shared/_head.html.haml
@@ -20,14 +20,14 @@
       window['ga-disable-UA-30021098-2'] = true;
 
   = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload'
-  = javascript_include_tag 'application', 'data-turbolinks-track': 'reload', async: Rails.env.production?
-  = javascript_pack_tag 'application', 'data-turbolinks-track': 'reload', async: Rails.env.production?
+  = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
+  = javascript_pack_tag 'application', 'data-turbolinks-track': 'reload'
   = stylesheet_pack_tag 'choices', 'data-turbolinks-track': 'reload'
-  = javascript_pack_tag 'choices', 'data-turbolinks-track': 'reload', async: Rails.env.production?
+  = javascript_pack_tag 'choices', 'data-turbolinks-track': 'reload'
 
   - if params[:controller] == 'charges'
-    = javascript_include_tag 'https://js.stripe.com/v2/', 'data-turbolinks-track': 'reload', async: Rails.env.production?
-    = javascript_pack_tag 'charges', 'data-turbolinks-track': 'reload', async: Rails.env.production?
+    = javascript_include_tag 'https://js.stripe.com/v2/', 'data-turbolinks-track': 'reload'
+    = javascript_pack_tag 'charges', 'data-turbolinks-track': 'reload'
 
   - if Rails.env.production?
     - if allow_functional_cookies?

diff --git a/package.json b/package.json
@@ -44,6 +44,6 @@
   "devDependencies": {
     "jest": "^20.0.4",
     "standard": "^10.0.2",
-    "webpack-dev-server": "^2.5.1"
+    "webpack-dev-server": ">=3.1.11"
   }
 }