aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2017-12-16 13:56:12 +0100
committerHarald Eilertsen <haraldei@anduin.net>2017-12-16 13:56:12 +0100
commit2fa2acd874756c6ee28767d68ccc4cabf0cfe66f (patch)
treebf496da7649824f67141a8440051d7bde47f05b3
parente48585aa7e6070e9a103c29d853b0e8c9a38d23d (diff)
downloadhmnoweb-2fa2acd874756c6ee28767d68ccc4cabf0cfe66f.tar.gz
hmnoweb-2fa2acd874756c6ee28767d68ccc4cabf0cfe66f.tar.bz2
hmnoweb-2fa2acd874756c6ee28767d68ccc4cabf0cfe66f.zip
Go back to release version of capistrano-postgresql.
Our changes for running without sudo has been upstreamed.
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock12
2 files changed, 4 insertions, 12 deletions
diff --git a/Gemfile b/Gemfile
index 9f8646f..19c8dd2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,9 +24,7 @@ group :deployment do
gem 'capistrano', '~> 3.3.4'
gem 'capistrano-bundler'
gem 'capistrano-rails'
- gem 'capistrano-postgresql',
- :git => 'https://github.com/capistrano-plugins/capistrano-postgresql.git',
- :branch => 'feature/psql_without_sudo' #'~>4.0'
+ gem 'capistrano-postgresql', '~> 4.6.1'
end
# Gems used only for assets and not required
diff --git a/Gemfile.lock b/Gemfile.lock
index a385121..d466381 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,14 +7,6 @@ GIT
refinerycms-pages (~> 2.1.0)
GIT
- remote: https://github.com/capistrano-plugins/capistrano-postgresql.git
- revision: fcdd992993c146e382bdd86ec6e31cf97b5db387
- branch: feature/psql_without_sudo
- specs:
- capistrano-postgresql (4.6.0)
- capistrano (>= 3.0)
-
-GIT
remote: https://github.com/refinery/refinerycms-acts-as-indexed.git
revision: 47cd0b6427a1ee7c513124c7a56c7cb5f93716f6
branch: 1-0-stable
@@ -87,6 +79,8 @@ GEM
capistrano-bundler (1.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
+ capistrano-postgresql (4.6.1)
+ capistrano (>= 3.0)
capistrano-rails (1.1.1)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
@@ -270,7 +264,7 @@ DEPENDENCIES
bcrypt-ruby (~> 3.0.0)
capistrano (~> 3.3.4)
capistrano-bundler
- capistrano-postgresql!
+ capistrano-postgresql (~> 4.6.1)
capistrano-rails
coffee-rails (~> 3.2)
jquery-rails (~> 2.3.0)