diff options
author | Harald Eilertsen <haraldei@anduin.net> | 2017-12-16 14:22:00 +0100 |
---|---|---|
committer | Harald Eilertsen <haraldei@anduin.net> | 2017-12-16 14:22:00 +0100 |
commit | 302aadd8bfd4030d9b2a71d5121fd650c0918338 (patch) | |
tree | 104a780a180e93dce09b435c0d5c5908e81a4b1c /Gemfile.lock | |
parent | 3c4b7f712d61a9006f90960273fdefcb0c7ca371 (diff) | |
parent | 734c8519b5cc7d69541726d6a7e15b917217756d (diff) | |
download | hmnoweb-302aadd8bfd4030d9b2a71d5121fd650c0918338.tar.gz hmnoweb-302aadd8bfd4030d9b2a71d5121fd650c0918338.tar.bz2 hmnoweb-302aadd8bfd4030d9b2a71d5121fd650c0918338.zip |
Merge branch 'permanent-merch-link'
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a385121..ec3b52a 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) @@ -109,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) @@ -122,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) @@ -254,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) @@ -270,7 +263,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) |