Merge branch 'gab_provision' of https://code.gab.com/gab/social/gab-social into develop

2021-01-27 16:16:48 -05:00
parent 3d06e94595 2952c9f59d
commit 87138932a0
28 changed files with 353 additions and 202 deletions
--- a/lib/gabsocial/migration_helpers.rb
+++ b/lib/gabsocial/migration_helpers.rb
@@ -43,7 +43,9 @@ module GabSocial
  module MigrationHelpers
    # Stub for Database.postgresql? from GitLab
    def self.postgresql?
-      ActiveRecord::Base.configurations[Rails.env]['adapter'].casecmp('postgresql_makara').zero?
+      %w[postgresql postgresql_makara].any? do |adapter|
+        ActiveRecord::Base.configurations[Rails.env]['adapter'].casecmp(adapter).zero?
+      end
    end

    # Stub for Database.mysql? from GitLab