diff --git a/Capfile b/Capfile index 9f54c1c..9b62e32 100644 --- a/Capfile +++ b/Capfile @@ -4,6 +4,9 @@ require 'capistrano/setup' # Include default deployment tasks require 'capistrano/deploy' +require "capistrano/scm/git" +install_plugin Capistrano::SCM::Git + # Include tasks from other gems included in your Gemfile # # For documentation on these, see for example: diff --git a/Gemfile b/Gemfile index 4b1b848..cad20e0 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' gem 'rails', '~> 4.2.11' gem 'sqlite3', '~> 1.3.6' -gem 'pg' +gem 'pg', '~> 0.15' gem 'sass-rails' diff --git a/Gemfile.lock b/Gemfile.lock index f1c2b37..65b55ca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -219,9 +219,7 @@ GEM orm_adapter (0.5.0) parser (2.6.2.1) ast (~> 2.4.0) - pg (1.1.4) - activesupport (>= 3.0) - phony (> 2.15) + pg (0.21.0) phony (2.15.49) phony_rails (0.14.11) activesupport (>= 3.0) @@ -431,7 +429,7 @@ DEPENDENCIES mini_racer morrisjs-rails nested_form - pg + pg (~> 0.15) phony (~> 2.15.11) phony_rails pry-rails diff --git a/config/deploy.rb b/config/deploy.rb index eec7549..8ad974c 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,5 +1,5 @@ # config valid only for current version of Capistrano -lock '3.6.1' +lock '3.11.0' set :application, 'clarion' set :repo_url, 'https://github.com/ignisf/clarion.git'