Merge branch 'master' into 709-organization-email-text

Author: seanmarcia

Capfile

@@ -24,7 +24,6 @@ require "capistrano/rails/migrations"
 require "capistrano/puma"
 require "capistrano/rails/console"
 require "capistrano/scm/git"
-require "capistrano/webpacker/precompile"
 
 install_plugin Capistrano::SCM::Git
 install_plugin Capistrano::Puma # Default puma tasks

Gemfile

@@ -69,7 +69,6 @@ group :development do
   gem "capistrano-bundler"
   gem "capistrano3-puma"
   gem "capistrano-rails-console", require: false
-  gem 'capistrano-webpacker-precompile', require: false
   gem "listen", "~> 3.1.5"
   gem "rails-erd"
   gem "spring"

Gemfile.lock

@@ -101,8 +101,6 @@ GEM
     capistrano-rvm (0.1.2)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
-    capistrano-webpacker-precompile (0.2)
-      capistrano (~> 3.1)
     capistrano3-puma (3.1.1)
       capistrano (~> 3.7)
       capistrano-bundler
@@ -480,7 +478,6 @@ DEPENDENCIES
   capistrano-rails
   capistrano-rails-console
   capistrano-rvm
-  capistrano-webpacker-precompile
   capistrano3-puma
   capybara (~> 3.12)
   capybara-screenshot

config/deploy.rb

@@ -74,8 +74,7 @@
   end
 
   before :starting,     :check_revision
-  # after  :finishing,    :compile_assets
-  after 'deploy:updated', 'webpacker:precompile'
+  after  :finishing,    :compile_assets
   after  :finishing,    :cleanup
   after  :finishing,    :ensure_start
 end