diff --git a/Gemfile b/Gemfile index e156dc2a0..4bbb38a3f 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,7 @@ gem 'rack-dev-mark', '~> 0.7.5' gem 'capistrano', '~> 3.8.1' gem 'capistrano-rails', '~> 1.2.3' gem 'capistrano-rbenv', '~> 2.1.1' -gem 'capistrano-bundler', '~> 1.2.0' +gem 'capistrano-bundler', '~> 1.5.0' gem "i18n", '~> 0.8.1' gem "bootstrap-sass", '~> 2.3.2.2' # locked because blacklight 4.7 diff --git a/Gemfile.lock b/Gemfile.lock index 0cd1b3324..bb1832a63 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,7 +70,7 @@ GEM tzinfo (~> 1.1) addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) - airbrussh (1.2.0) + airbrussh (1.3.2) sshkit (>= 1.6.1, != 1.7.0) arel (6.0.4) ast (2.4.0) @@ -101,9 +101,8 @@ GEM i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (1.2.0) + capistrano-bundler (1.5.0) capistrano (~> 3.1) - sshkit (~> 1.2) capistrano-rails (1.2.3) capistrano (~> 3.1) capistrano-bundler (~> 1.1) @@ -245,9 +244,9 @@ GEM multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (4.1.0) + net-scp (2.0.0) + net-ssh (>= 2.6.5, < 6.0.0) + net-ssh (5.2.0) netrc (0.10.3) nokogiri (1.10.3) mini_portile2 (~> 2.4.0) @@ -424,7 +423,7 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sshkit (1.13.1) + sshkit (1.19.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) stomp (1.3.4) @@ -471,7 +470,7 @@ DEPENDENCIES bower-rails (~> 0.11.0) byebug capistrano (~> 3.8.1) - capistrano-bundler (~> 1.2.0) + capistrano-bundler (~> 1.5.0) capistrano-rails (~> 1.2.3) capistrano-rbenv (~> 2.1.1) capybara (~> 2.14.0)