From 516576e5480f3ba8956a6008a1d3709a78efcc15 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Tue, 6 Aug 2019 12:02:28 +0200 Subject: Emergency fixes to make hmno run on freebsd 12. Upgrade to use Ruby 2.5.5. Use patched version of rails/activerecord/postgres-adapter that should fix compatibility with Ruby 2.5. Patch Arel inline to be compatible with Ruby 2.5. --- Gemfile.lock | 94 ++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 44 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index fc42d38..1a3e05f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,51 @@ +GIT + remote: https://code.volse.no/rails.git + revision: 3ddfd9f91a143271b81fd554a611e029ed643794 + branch: 3-2-stable-for-hmno + specs: + actionmailer (3.2.22.5) + actionpack (= 3.2.22.5) + mail (~> 2.5.4) + actionpack (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) + builder (~> 3.0) + erubis (~> 2.7.0) + journey (~> 1.0.4) + rack (~> 1.4.5) + rack-cache (~> 1.2) + rack-test (~> 0.6.1) + sprockets (~> 2.2.1) + activemodel (3.2.22.5) + activesupport (= 3.2.22.5) + builder (~> 3.0) + activerecord (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) + activeresource (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) + activesupport (3.2.22.5) + i18n (~> 0.6, >= 0.6.4) + multi_json (~> 1.0) + rails (3.2.22.5) + actionmailer (= 3.2.22.5) + actionpack (= 3.2.22.5) + activerecord (= 3.2.22.5) + activeresource (= 3.2.22.5) + activesupport (= 3.2.22.5) + bundler (~> 1.0) + railties (= 3.2.22.5) + railties (3.2.22.5) + actionpack (= 3.2.22.5) + activesupport (= 3.2.22.5) + rack-ssl (~> 1.3.2) + rake (>= 0.8.7) + rdoc (~> 3.4) + thor (>= 0.14.6, < 2.0) + GIT remote: https://code.volse.no/refinerycms-pc_banners.git revision: b1edd6053206ebcfbca92c951716eb627a901556 @@ -45,33 +93,6 @@ GEM remote: https://rubygems.org/ specs: SyslogLogger (2.0) - actionmailer (3.2.22.5) - actionpack (= 3.2.22.5) - mail (~> 2.5.4) - actionpack (3.2.22.5) - activemodel (= 3.2.22.5) - activesupport (= 3.2.22.5) - builder (~> 3.0.0) - erubis (~> 2.7.0) - journey (~> 1.0.4) - rack (~> 1.4.5) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.2.1) - activemodel (3.2.22.5) - activesupport (= 3.2.22.5) - builder (~> 3.0.0) - activerecord (3.2.22.5) - activemodel (= 3.2.22.5) - activesupport (= 3.2.22.5) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.22.5) - activemodel (= 3.2.22.5) - activesupport (= 3.2.22.5) - activesupport (3.2.22.5) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) acts-as-taggable-on (2.4.1) rails (>= 3, < 5) acts_as_indexed (0.8.3) @@ -83,7 +104,7 @@ GEM babosa (1.0.2) bcrypt-ruby (3.1.5) bcrypt (>= 3.1.3) - builder (3.0.4) + builder (3.2.3) byebug (10.0.2) capistrano (3.10.2) airbrussh (>= 1.0.0) @@ -160,25 +181,10 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (3.2.22.5) - actionmailer (= 3.2.22.5) - actionpack (= 3.2.22.5) - activerecord (= 3.2.22.5) - activeresource (= 3.2.22.5) - activesupport (= 3.2.22.5) - bundler (~> 1.0) - railties (= 3.2.22.5) rails-i18n (0.7.4) i18n (~> 0.5) rails_autolink (1.0.9) rails (~> 3.1) - railties (3.2.22.5) - actionpack (= 3.2.22.5) - activesupport (= 3.2.22.5) - rack-ssl (~> 1.3.2) - rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) rake (12.3.2) rdoc (3.12.2) json (~> 1.4) @@ -293,7 +299,7 @@ DEPENDENCIES pg (~> 0.11) piwik_analytics (~> 1.0.2) puma - rails (~> 3.2) + rails! refinerycms (~> 2.1.0) refinerycms-acts-as-indexed! refinerycms-blog (~> 2.1.0)! -- cgit v1.2.3