From 2fa2acd874756c6ee28767d68ccc4cabf0cfe66f Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Sat, 16 Dec 2017 13:56:12 +0100
Subject: Go back to release version of capistrano-postgresql.

Our changes for running without sudo has been upstreamed.
---
 Gemfile.lock | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'Gemfile.lock')

diff --git a/Gemfile.lock b/Gemfile.lock
index a385121..d466381 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,14 +6,6 @@ GIT
     refinerycms-pc_banners (2.0.2)
       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
@@ -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)
-- 
cgit v1.2.3


From 734c8519b5cc7d69541726d6a7e15b917217756d Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Sat, 16 Dec 2017 13:59:01 +0100
Subject: Update uglifier and it's dependencies.

---
 Gemfile.lock | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'Gemfile.lock')

diff --git a/Gemfile.lock b/Gemfile.lock
index d466381..ec3b52a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -103,7 +103,7 @@ GEM
       multi_json (~> 1.0)
       rack
     erubis (2.7.0)
-    execjs (2.0.2)
+    execjs (2.7.0)
     filters_spam (0.3)
     friendly_id (4.0.10.1)
       activerecord (>= 3.0, < 4.0)
@@ -116,7 +116,7 @@ GEM
     jquery-rails (2.3.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.3)
+    json (1.8.6)
     lorem (0.1.2)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -248,9 +248,8 @@ GEM
       polyglot (>= 0.3.1)
     truncate_html (0.9.3)
     tzinfo (0.3.46)
-    uglifier (2.0.1)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
+    uglifier (4.0.2)
+      execjs (>= 0.3.0, < 3)
     warden (1.2.3)
       rack (>= 1.0)
     will_paginate (3.0.7)
-- 
cgit v1.2.3