From 3a9397518c5026ea03e992926b766bb8247c30f9 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 8 Nov 2020 16:09:31 +0100 Subject: Update deps and add activerecord-postgresql-adapter. --- Gemfile | 2 ++ Gemfile.lock | 56 ++++++++++++++++++++++++++++++-------------------------- 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/Gemfile b/Gemfile index 0b433eb..dec3cd1 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,7 @@ source 'https://rubygems.org' gem 'rails', git: "https://code.volse.no/rails.git", branch: "3-2-stable-for-hmno" + #path: "../rails" group :development, :test do gem 'sqlite3' @@ -53,6 +54,7 @@ gem 'puma' gem 'test-unit', '~> 3.0' gem 'SyslogLogger' gem 'pg', '~> 0.11' +gem 'activerecord-postgresql-adapter' # Refinery CMS gem 'refinerycms', '~> 2.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index fdb45d2..152a936 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,9 +70,9 @@ GIT GIT remote: https://github.com/codahale/bcrypt-ruby.git - revision: 7644e3684d96fb49f5aa20cb5f547cb1b56b3f38 + revision: fc652e5248a4132af2c5f5c0b61eeceff02f4316 specs: - bcrypt (3.1.12) + bcrypt (3.1.16) GIT remote: https://github.com/refinery/refinerycms-acts-as-indexed.git @@ -93,34 +93,35 @@ GEM remote: https://rubygems.org/ specs: SyslogLogger (2.0) + activerecord-postgresql-adapter (0.0.1) + pg acts-as-taggable-on (2.4.1) rails (>= 3, < 5) acts_as_indexed (0.8.3) - airbrussh (1.3.1) + airbrussh (1.4.0) sshkit (>= 1.6.1, != 1.7.0) arel (3.0.3) awesome_nested_set (2.1.6) activerecord (>= 3.0.0) - babosa (1.0.2) + babosa (1.0.4) bcrypt-ruby (3.1.5) bcrypt (>= 3.1.3) bcrypt_pbkdf (1.0.1) - builder (3.2.3) - byebug (10.0.2) + builder (3.2.4) + byebug (11.1.3) capistrano (3.10.2) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (1.4.0) + capistrano-bundler (2.0.1) capistrano (~> 3.1) - sshkit (~> 1.2) capistrano-postgresql (4.7.0) capistrano (>= 3.0) - capistrano-rails (1.4.0) + capistrano-rails (1.6.1) capistrano (~> 3.1) - capistrano-bundler (~> 1.1) - capistrano-rbenv (2.1.4) + capistrano-bundler (>= 1.1, < 3) + capistrano-rbenv (2.2.0) capistrano (~> 3.1) sshkit (~> 1.3) coffee-rails (3.2.2) @@ -130,7 +131,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.7) decorators (1.0.5) railties (>= 3.0.19) devise (2.2.8) @@ -163,10 +164,11 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) - multi_json (1.13.1) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (5.0.2) + multi_json (1.15.0) + net-scp (3.0.0) + net-ssh (>= 2.6.5, < 7.0.0) + net-ssh (6.1.0) + nio4r (2.5.4) orm_adapter (0.5.0) pg (0.21.0) piwik_analytics (1.0.2) @@ -174,10 +176,11 @@ GEM activesupport rails (>= 3.0.0) polyglot (0.3.5) - power_assert (1.1.3) - puma (3.12.0) + power_assert (1.2.0) + puma (5.0.4) + nio4r (~> 2.0) rack (1.4.7) - rack-cache (1.9.0) + rack-cache (1.12.1) rack (>= 0.4) rack-ssl (1.3.4) rack @@ -187,7 +190,7 @@ GEM i18n (~> 0.5) rails_autolink (1.0.9) rails (~> 3.1) - rake (12.3.2) + rake (13.0.1) rdoc (3.12.2) json (~> 1.4) refinerycms (2.1.5) @@ -260,20 +263,20 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.13) - sshkit (1.18.0) + sqlite3 (1.4.2) + sshkit (1.21.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - test-unit (3.2.8) + test-unit (3.3.6) power_assert - thor (0.20.3) + thor (1.0.1) tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) truncate_html (0.9.3) - tzinfo (0.3.55) - uglifier (4.1.20) + tzinfo (0.3.58) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) warden (1.2.7) rack (>= 1.0) @@ -284,6 +287,7 @@ PLATFORMS DEPENDENCIES SyslogLogger + activerecord-postgresql-adapter bcrypt (~> 3.1.0)! bcrypt_pbkdf (~> 1.0) byebug -- cgit v1.2.3