midgard/tab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update high_voltage version and stop capistrano from complaining

Browse source
This commit is contained in:
redfast00 2018-07-25 20:37:49 +02:00
parent ed8b870739
commit 000ee333dc
No known key found for this signature in database
GPG key ID: 5946E0E34FD0553C
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Capfile
View file

@ -4,6 +4,10 @@ require 'capistrano/setup'
# Includes default deployment tasks # Includes default deployment tasks
require 'capistrano/deploy' require 'capistrano/deploy'
# Stop Capistrano from complaining
require "capistrano/scm/git"
install_plugin Capistrano::SCM::Git
require 'capistrano/rails' require 'capistrano/rails'
require 'capistrano/rbenv' require 'capistrano/rbenv'

2
Gemfile
View file

@ -90,7 +90,7 @@ group :production do
gem 'mysql2', '< 0.6.0', '>= 0.4.4' gem 'mysql2', '< 0.6.0', '>= 0.4.4'
end end
gem 'high_voltage', '~> 2.4.0' gem 'high_voltage', '~> 3.1'
# Errors on errbit # Errors on errbit
gem 'airbrake' gem 'airbrake'

4
Gemfile.lock
View file

@ -133,7 +133,7 @@ GEM
html2haml (>= 1.0.1) html2haml (>= 1.0.1)
railties (>= 4.0.1) railties (>= 4.0.1)
hashie (3.5.7) hashie (3.5.7)
high_voltage (2.4.0) high_voltage (3.1.0)
html2haml (2.2.0) html2haml (2.2.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
haml (>= 4.0, < 6) haml (>= 4.0, < 6)
@ -339,7 +339,7 @@ DEPENDENCIES
faker faker
friendly_id (~> 5.1.0) friendly_id (~> 5.1.0)
haml-rails haml-rails
high_voltage (~> 2.4.0) high_voltage (~> 3.1)
jbuilder (~> 2.0) jbuilder (~> 2.0)
jquery-datatables-rails jquery-datatables-rails
jquery-rails jquery-rails