diff --git a/.idea/.generators b/.idea/.generators index d054173..90f6a99 100644 --- a/.idea/.generators +++ b/.idea/.generators @@ -5,4 +5,4 @@ You are allowed to: 2. Remove generators 3. Add installed generators To add new installed generators automatically delete this file and reload the project. ---> +--> diff --git a/.idea/.rakeTasks b/.idea/.rakeTasks index bcf5c59..5372d59 100644 --- a/.idea/.rakeTasks +++ b/.idea/.rakeTasks @@ -4,4 +4,4 @@ You are allowed to: 1. Remove rake task 2. Add existing rake tasks To add existing rake tasks automatically delete this file and reload the project. ---> +--> diff --git a/.idea/vereto-api.iml b/.idea/vereto-api.iml index 640eaee..917d2ff 100644 --- a/.idea/vereto-api.iml +++ b/.idea/vereto-api.iml @@ -33,16 +33,30 @@ + + + + + + + + + - + + + + + + @@ -50,11 +64,17 @@ + + + + + - + + @@ -62,16 +82,24 @@ + + + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b552242..5370635 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,13 @@ - + + + + + + @@ -32,16 +37,6 @@ - - - - - - - - - - @@ -65,11 +60,11 @@ - + - - + + @@ -89,17 +84,27 @@ - + - + + + + + + + + + + + - - + + @@ -141,6 +146,7 @@ todos todo + cap article @@ -199,10 +205,10 @@ @@ -417,35 +423,34 @@ - + - - - + + - + + - - @@ -461,13 +466,6 @@ - - - - - - - @@ -720,14 +718,6 @@ - - - - - - - - @@ -760,10 +750,18 @@ - + - - + + + + + + + + + + @@ -771,15 +769,23 @@ - + - - + + + + + + + + + + diff --git a/Gemfile b/Gemfile index a0300c9..070493b 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem 'jwt' gem 'rack-cors', :require => 'rack/cors' gem 'fast_jsonapi' gem 'will_paginate' -gem 'capistrano', '~> 3.7', '>= 3.7.1' +gem 'capistrano', '3.10.1' gem 'capistrano-rails', '~> 1.2' gem 'capistrano-passenger', '~> 0.2.0' gem 'capistrano-rbenv' diff --git a/Gemfile.lock b/Gemfile.lock index 902804c..0f1a699 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,10 +38,28 @@ GEM i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) + airbrussh (1.3.0) + sshkit (>= 1.6.1, != 1.7.0) arel (8.0.0) bcrypt (3.1.11) builder (3.2.3) byebug (10.0.0) + capistrano (3.10.1) + airbrussh (>= 1.0.0) + i18n + rake (>= 10.0.0) + sshkit (>= 1.9.0) + capistrano-bundler (1.3.0) + capistrano (~> 3.1) + sshkit (~> 1.2) + capistrano-passenger (0.2.0) + capistrano (~> 3.0) + capistrano-rails (1.3.1) + capistrano (~> 3.1) + capistrano-bundler (~> 1.1) + capistrano-rbenv (2.1.3) + capistrano (~> 3.1) + sshkit (~> 1.3) concurrent-ruby (1.0.5) crass (1.0.3) database_cleaner (1.6.2) @@ -59,7 +77,7 @@ GEM activesupport (~> 5.0) multi_json (~> 1.12) oj (~> 3.3) - ffi (1.9.21) + ffi (1.9.23) globalid (0.4.1) activesupport (>= 4.2.0) i18n (0.9.5) @@ -80,6 +98,9 @@ GEM minitest (5.11.3) multi_json (1.13.1) mysql2 (0.4.10) + net-scp (1.2.1) + net-ssh (>= 2.6.5) + net-ssh (4.2.0) nio4r (2.2.0) nokogiri (1.8.2) mini_portile2 (~> 2.3.0) @@ -87,7 +108,7 @@ GEM puma (3.11.2) rack (2.0.4) rack-cors (1.0.2) - rack-test (0.8.2) + rack-test (0.8.3) rack (>= 1.0, < 3) rails (5.1.5) actioncable (= 5.1.5) @@ -148,6 +169,9 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + sshkit (1.16.0) + net-scp (>= 1.1.2) + net-ssh (>= 2.8.0) thor (0.20.0) thread_safe (0.3.6) tzinfo (1.2.5) @@ -163,6 +187,11 @@ PLATFORMS DEPENDENCIES bcrypt (~> 3.1.7) byebug + capistrano (= 3.10.1) + capistrano-bundler + capistrano-passenger (~> 0.2.0) + capistrano-rails (~> 1.2) + capistrano-rbenv database_cleaner factory_girl_rails (~> 4.0) faker diff --git a/config/deploy.rb b/config/deploy.rb index 195a7ab..e01704b 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,5 +1,5 @@ # config valid only for current version of Capistrano -lock "3.8.1" +lock "3.10.1" set :application, "vereto-api" set :repo_url, "git@gogs.vereto.tech:PromoStarr/vereto-api.git"