Skip to content

Commit

Permalink
wip update capistrano dependencies
Browse files Browse the repository at this point in the history
wip db migration needs keyword params in ruby 3, not hash args
  • Loading branch information
barmintor committed Dec 14, 2023
1 parent a1744f1 commit 444ad46
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ group :development do
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'capistrano', '3.8.2'
gem 'capistrano-rails', '~> 1.2'
gem 'capistrano', '~> 3.17.3', require: false
gem 'capistrano-rails', '~> 1.4', require: false
gem 'capistrano-bundler', '~> 1.1', require: false
gem 'capistrano-rvm', '~> 0.1', require: false
gem 'capistrano-passenger', '~> 0.1', require: false
gem 'capistrano-passenger', '~> 0.2', require: false
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
Expand Down
22 changes: 11 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ GEM
tzinfo (~> 2.0)
addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0)
airbrussh (1.3.1)
airbrussh (1.5.0)
sshkit (>= 1.6.1, != 1.7.0)
bcrypt (3.1.18)
bigdecimal (3.1.4)
Expand All @@ -85,7 +85,7 @@ GEM
builder (3.2.4)
byebug (11.0.0)
cancancan (3.5.0)
capistrano (3.8.2)
capistrano (3.17.3)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
Expand Down Expand Up @@ -143,7 +143,7 @@ GEM
globalid (1.1.0)
activesupport (>= 5.0)
hashie (5.0.0)
i18n (1.13.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jbuilder (2.8.0)
activesupport (>= 4.2.0)
Expand Down Expand Up @@ -176,11 +176,11 @@ GEM
net-protocol
net-protocol (0.2.1)
timeout
net-scp (2.0.0)
net-ssh (>= 2.6.5, < 6.0.0)
net-scp (4.0.0)
net-ssh (>= 2.6.5, < 8.0.0)
net-smtp (0.3.3)
net-protocol
net-ssh (5.2.0)
net-ssh (7.2.0)
nio4r (2.5.9)
nokogiri (1.15.5)
mini_portile2 (~> 2.8.2)
Expand Down Expand Up @@ -229,7 +229,7 @@ GEM
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
rake (13.0.6)
rake (13.1.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
Expand Down Expand Up @@ -290,7 +290,7 @@ GEM
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.4.2)
sshkit (1.18.2)
sshkit (1.21.6)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
thor (1.2.1)
Expand Down Expand Up @@ -327,10 +327,10 @@ DEPENDENCIES
bootsnap
byebug
cancancan (~> 3.0)
capistrano (= 3.8.2)
capistrano (~> 3.17.3)
capistrano-bundler (~> 1.1)
capistrano-passenger (~> 0.1)
capistrano-rails (~> 1.2)
capistrano-passenger (~> 0.2)
capistrano-rails (~> 1.4)
capistrano-rvm (~> 0.1)
capybara (~> 3.39)
cul-ldap!
Expand Down
2 changes: 1 addition & 1 deletion config/deploy.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# config valid only for current version of Capistrano
lock "3.8.2"
lock "~> 3.17.3"

set :department, 'ldpd'
set :instance, fetch(:department)
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20170814194528_add_primary_location.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class AddPrimaryLocation < ActiveRecord::Migration[5.1]
def up
add_reference :locations, :primary_location, foreign_key: {to_table: :locations}
add_column :locations, :primary, :boolean, {default: false}
add_column :locations, :primary, :boolean, default: false
add_index :locations, :primary
end

Expand Down

0 comments on commit 444ad46

Please sign in to comment.