diff --git a/Capfile b/Capfile index 62b53d60..b6a7736a 100644 --- a/Capfile +++ b/Capfile @@ -3,7 +3,7 @@ require 'capistrano/setup' # Includes default deployment tasks require 'capistrano/deploy' - +require "capistrano/scm/git" # Includes tasks from other gems included in your Gemfile # # For documentation on these, see for example: diff --git a/Gemfile.lock b/Gemfile.lock index af3287fb..b5374b25 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -471,7 +471,7 @@ GEM xpath (3.2.0) nokogiri (~> 1.8) yard (0.9.24) - zeitwerk (2.2.2) + zeitwerk (2.3.0) PLATFORMS ruby diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index f034327d..a9c972c8 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -6,11 +6,6 @@ //= link cmtool/application.js //= link cmtool/application.css // -//= link supplier/foundation1/application.js -//= link supplier/foundation1/application.css -// -//= link supplier/app/application.js -// //= link qr_sheet/application.css // //= link user/foundation/application.css diff --git a/config/deploy.rb b/config/deploy.rb index 1fe4906c..88256a63 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -94,9 +94,9 @@ namespace :deploy do on roles(fetch(:assets_roles)) do run_locally do with rails_env: fetch(:stage) do - execute "RAILS_GROUPS=assets RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:precompile" - execute "RAILS_GROUPS=assets RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:dedigest" - execute "RAILS_GROUPS=assets RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:gzip" + execute "RAILS_GROUPS=assets RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bundle exec rails assets:precompile" + execute "RAILS_GROUPS=assets RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bundle exec rails assets:dedigest" + #execute "RAILS_GROUPS=assets RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:gzip" end end