diff options
| author | Alex Dunn <dunn.alex@gmail.com> | 2017-04-16 03:52:18 -0700 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-16 12:52:18 +0200 |
| commit | 865cb39e9b27caf46c7592a5a36918afdf5e4104 (patch) | |
| tree | e60a4dc8cc34591f8d244f4a86a6b3e304b523b5 | |
| parent | 5d710b1139b34f2ed6bd556f448fa7248354e758 (diff) | |
lock capistrano to 3.8.0 (#1890)
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | config/deploy.rb | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile index 57600ed9f..5d75c11ea 100644 --- a/Gemfile +++ b/Gemfile @@ -88,7 +88,7 @@ group :development do gem 'bullet' gem 'active_record_query_trace' - gem 'capistrano' + gem 'capistrano', '3.8.0' gem 'capistrano-rails' gem 'capistrano-rbenv' gem 'capistrano-yarn' diff --git a/Gemfile.lock b/Gemfile.lock index 2f55abec7..4b4dd105c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,7 +41,7 @@ GEM tzinfo (~> 1.1) addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) - airbrussh (1.1.2) + airbrussh (1.2.0) sshkit (>= 1.6.1, != 1.7.0) arel (7.1.4) ast (2.3.0) @@ -469,7 +469,7 @@ DEPENDENCIES binding_of_caller browserify-rails bullet - capistrano + capistrano (= 3.8.0) capistrano-faster-assets (~> 1.0) capistrano-rails capistrano-rbenv diff --git a/config/deploy.rb b/config/deploy.rb index 9bcf907be..b1cade49d 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,4 +1,7 @@ -lock '3.7.2' +# frozen_string_literal: true + +lock '3.8.0' + set :repo_url, ENV.fetch('REPO', 'https://github.com/tootsuite/mastodon.git') set :branch, ENV.fetch('BRANCH', 'master') |