From 000ee333dc7858fda9921cb66ead52863afd4dad Mon Sep 17 00:00:00 2001 From: redfast00 Date: Wed, 25 Jul 2018 20:37:49 +0200 Subject: [PATCH] Update high_voltage version and stop capistrano from complaining --- Capfile | 4 ++++ Gemfile | 2 +- Gemfile.lock | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Capfile b/Capfile index d3f8bb5..ac5f4b6 100644 --- a/Capfile +++ b/Capfile @@ -4,6 +4,10 @@ require 'capistrano/setup' # Includes default deployment tasks require 'capistrano/deploy' +# Stop Capistrano from complaining +require "capistrano/scm/git" +install_plugin Capistrano::SCM::Git + require 'capistrano/rails' require 'capistrano/rbenv' diff --git a/Gemfile b/Gemfile index dd25269..14d6106 100644 --- a/Gemfile +++ b/Gemfile @@ -90,7 +90,7 @@ group :production do gem 'mysql2', '< 0.6.0', '>= 0.4.4' end -gem 'high_voltage', '~> 2.4.0' +gem 'high_voltage', '~> 3.1' # Errors on errbit gem 'airbrake' diff --git a/Gemfile.lock b/Gemfile.lock index d59574f..732e0bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -133,7 +133,7 @@ GEM html2haml (>= 1.0.1) railties (>= 4.0.1) hashie (3.5.7) - high_voltage (2.4.0) + high_voltage (3.1.0) html2haml (2.2.0) erubis (~> 2.7.0) haml (>= 4.0, < 6) @@ -339,7 +339,7 @@ DEPENDENCIES faker friendly_id (~> 5.1.0) haml-rails - high_voltage (~> 2.4.0) + high_voltage (~> 3.1) jbuilder (~> 2.0) jquery-datatables-rails jquery-rails