Add support for Redmine 5.1/6.0/6.1

n-rodriguez · n-rodriguez · commit bad6fe7a7084 · 2026-02-02T04:21:06.000+01:00
diff --git a/.github/workflows/brakeman.yml.old b/.github/workflows/brakeman.yml.old
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,24 +1,64 @@
-name: Test
+name: CI
 
 on:
   - push
   - pull_request
 
 jobs:
   test:
-    name: ${{ matrix.redmine }} ${{ matrix.db }} ruby-${{ matrix.ruby }}
+    name: ${{ matrix.redmine[0] }} ${{ matrix.db }} ruby-${{ matrix.ruby }}
     runs-on: ubuntu-latest
 
     strategy:
-      matrix:
-        ruby: ['2.7', '3.0', '3.1']
-        redmine: ['5.0-stable', 'master']
-        db: ['postgres', 'mysql']
       fail-fast: false
+      matrix:
+        ruby:
+          - '3.4'
+          - '3.3'
+          - '3.2'
+          - '3.1'
+          - '3.0'
+        redmine:
+          # we must follow "additionals" Redmine plugin version constraints
+          # see: https://github.com/alphanodes/additionals/blob/main/CHANGELOG.md
+          # [redmine_version, additionals_version]
+          - ['5.0-stable', '3.2.0']
+          - ['5.1-stable', '3.4.0']
+          - ['6.0-stable', '4.0.0']
+          - ['6.1-stable', '4.3.0']
+        db:
+          - 'postgres'
+          # - 'mysql'
+
+        exclude:
+          - ruby: '3.4'
+            redmine: ['5.0-stable', '3.2.0']
+          - ruby: '3.4'
+            redmine: ['5.1-stable', '3.4.0']
+          - ruby: '3.4'
+            redmine: ['6.0-stable', '4.0.0']
+
+          - ruby: '3.3'
+            redmine: ['5.0-stable', '3.2.0']
+          - ruby: '3.3'
+            redmine: ['5.1-stable', '3.4.0']
+
+          - ruby: '3.2'
+            redmine: ['5.0-stable', '3.2.0']
+
+          - ruby: '3.1'
+            redmine: ['6.1-stable', '4.3.0']
+
+          - ruby: '3.0'
+            redmine: ['5.1-stable', '3.4.0']
+          - ruby: '3.0'
+            redmine: ['6.0-stable', '4.0.0']
+          - ruby: '3.0'
+            redmine: ['6.1-stable', '4.3.0']
 
     services:
       postgres:
-        image: postgres:14
+        image: postgres:18
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -32,7 +72,7 @@ jobs:
           --health-retries 5
 
       mysql:
-        image: mysql:8.0
+        image: mysql:9.6
         env:
           MYSQL_ROOT_PASSWORD: 'BestPasswordEver'
         ports:
@@ -51,34 +91,32 @@ jobs:
         if: matrix.db == 'mysql'
 
       - name: Checkout Redmine
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           repository: redmine/redmine
-          ref: ${{ matrix.redmine }}
           path: redmine
+          ref: ${{ matrix.redmine[0] }}
 
       - name: Checkout redmine_git_hosting
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           path: redmine/plugins/redmine_git_hosting
 
       - name: Checkout additionals
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           repository: AlphaNodes/additionals
           path: redmine/plugins/additionals
+          ref: ${{ matrix.redmine[1] }}
 
       - name: Checkout redmine_sidekiq
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
-          # TODO Switch back to the original repo, once https://github.com/ogom/redmine_sidekiq/pull/16 is released
-          # repository: ogom/redmine_sidekiq
-          repository: dosyfier/redmine_sidekiq
-          ref: fix-rails-6
+          repository: redmine-git-hosting/redmine_sidekiq
           path: redmine/plugins/redmine_sidekiq
 
       - name: Checkout gitolite
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           repository: sitaramc/gitolite
           path: gitolite
@@ -120,12 +158,20 @@ jobs:
         working-directory: redmine
         run: |
           sudo useradd --create-home git
+          sudo chmod 755 /home/git /home/runner
           sudo -n -u git -i mkdir bin
           sudo -n -u git -i $GITHUB_WORKSPACE/gitolite/install -to /home/git/bin
           sudo cp plugins/redmine_git_hosting/ssh_keys/redmine_gitolite_admin_id_rsa.pub /home/git/
           sudo chown git.git /home/git/redmine_gitolite_admin_id_rsa.pub
           sudo -n -u git -i bin/gitolite setup -pk redmine_gitolite_admin_id_rsa.pub
 
+      - name: Setup Ruby dependencies
+        working-directory: redmine
+        if: matrix.redmine[0] == '6.0-stable' || matrix.redmine[0] == '6.1-stable'
+        run: |
+          echo "gem 'observer'" > Gemfile.local
+          echo "gem 'redcarpet'" >> Gemfile.local
+
       - name: Install Ruby dependencies
         working-directory: redmine
         run: |
diff --git a/.github/workflows/rubocop.yml.old b/.github/workflows/rubocop.yml.old
diff --git a/.github/workflows/stylelint.yml.old b/.github/workflows/stylelint.yml.old
diff --git a/Gemfile b/Gemfile
@@ -32,7 +32,7 @@ gem 'RedCloth'
 gem 'rack-parser', require: 'rack/parser'
 
 # temp autoloading fix
-gem 'sidekiq', '<7'
+# gem 'sidekiq', '<7'
 gem 'sshkey'
 
 group :development, :test do
diff --git a/app/controllers/repository_mirrors_controller.rb b/app/controllers/repository_mirrors_controller.rb
@@ -6,7 +6,11 @@ class RepositoryMirrorsController < RedmineGitHostingController
 
   accept_api_auth :index, :show
 
-  helper :additionals_clipboardjs
+  if RedmineGitHosting.old_additionals?
+    helper :additionals_clipboardjs
+  else
+    helper :additionals_clipboard
+  end
 
   def index
     @repository_mirrors = @repository.mirrors.sorted
diff --git a/app/models/git_cache.rb b/app/models/git_cache.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class GitCache < ActiveRecord::Base
+class GitCache < RedmineGitHosting.old_redmine? ? ActiveRecord::Base : ApplicationRecord
   include Redmine::SafeAttributes
 
   CACHE_ADAPTERS = [%w[Database database],
diff --git a/app/models/github_comment.rb b/app/models/github_comment.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class GithubComment < ActiveRecord::Base
+class GithubComment < RedmineGitHosting.old_redmine? ? ActiveRecord::Base : ApplicationRecord
   ## Relations
   belongs_to :journal
 
diff --git a/app/models/github_issue.rb b/app/models/github_issue.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class GithubIssue < ActiveRecord::Base
+class GithubIssue < RedmineGitHosting.old_redmine? ? ActiveRecord::Base : ApplicationRecord
   ## Relations
   belongs_to :issue
 
diff --git a/app/models/gitolite_public_key.rb b/app/models/gitolite_public_key.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class GitolitePublicKey < ActiveRecord::Base
+class GitolitePublicKey < RedmineGitHosting.old_redmine? ? ActiveRecord::Base : ApplicationRecord
   include Redmine::SafeAttributes
 
   TITLE_LENGTH_LIMIT = 60
diff --git a/app/models/protected_branches_member.rb b/app/models/protected_branches_member.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class ProtectedBranchesMember < ActiveRecord::Base
+class ProtectedBranchesMember < RedmineGitHosting.old_redmine? ? ActiveRecord::Base : ApplicationRecord
   include Redmine::SafeAttributes
 
   ## Attributes
diff --git a/app/models/repository_deployment_credential.rb b/app/models/repository_deployment_credential.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class RepositoryDeploymentCredential < ActiveRecord::Base
+class RepositoryDeploymentCredential < RedmineGitHosting.old_redmine? ? ActiveRecord::Base : ApplicationRecord
   include Redmine::SafeAttributes
 
   VALID_PERMS  = ['R', 'RW+'].freeze
diff --git a/app/models/repository_git_config_key.rb b/app/models/repository_git_config_key.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class RepositoryGitConfigKey < ActiveRecord::Base
+class RepositoryGitConfigKey < RedmineGitHosting.old_redmine? ? ActiveRecord::Base : ApplicationRecord
   include Redmine::SafeAttributes
 
   ## Attributes
diff --git a/app/models/repository_git_extra.rb b/app/models/repository_git_extra.rb
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-class RepositoryGitExtra < ActiveRecord::Base
+class RepositoryGitExtra < RedmineGitHosting.old_redmine? ? ActiveRecord::Base : ApplicationRecord
   include Redmine::SafeAttributes
 
-  SMART_HTTP_OPTIONS = [[l(:label_disabled), '0'],
-                        [l(:label_http_only), '3'],
-                        [l(:label_https_only), '1'],
-                        [l(:label_https_and_http), '2']].freeze
+  SMART_HTTP_OPTIONS = [[I18n.t(:label_disabled), '0'],
+                        [I18n.t(:label_http_only), '3'],
+                        [I18n.t(:label_https_only), '1'],
+                        [I18n.t(:label_https_and_http), '2']].freeze
 
   ALLOWED_URLS = %w[ssh http https go git git_annex].freeze
 
@@ -33,7 +33,11 @@ class RepositoryGitExtra < ActiveRecord::Base
   validate :validate_urls_order
 
   ## Serializations
-  serialize :urls_order, Array
+  if RedmineGitHosting.old_redmine?
+    serialize :urls_order, Array
+  else
+    serialize :urls_order, type: Array
+  end
 
   ## Callbacks
   before_save :check_urls_order_consistency
diff --git a/app/models/repository_mirror.rb b/app/models/repository_mirror.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class RepositoryMirror < ActiveRecord::Base
+class RepositoryMirror < RedmineGitHosting.old_redmine? ? ActiveRecord::Base : ApplicationRecord
   include Redmine::SafeAttributes
 
   PUSHMODE_MIRROR       = 0
diff --git a/app/models/repository_post_receive_url.rb b/app/models/repository_post_receive_url.rb
@@ -2,7 +2,7 @@
 
 require 'uri'
 
-class RepositoryPostReceiveUrl < ActiveRecord::Base
+class RepositoryPostReceiveUrl < RedmineGitHosting.old_redmine? ? ActiveRecord::Base : ApplicationRecord
   include Redmine::SafeAttributes
 
   ## Attributes
@@ -22,7 +22,11 @@ class RepositoryPostReceiveUrl < ActiveRecord::Base
   validates :mode, presence: true, inclusion: { in: %i[github get post] }
 
   ## Serializations
-  serialize :triggers, Array
+  if RedmineGitHosting.old_redmine?
+    serialize :triggers, Array
+  else
+    serialize :triggers, type: Array
+  end
 
   ## Scopes
   scope :active, -> { where active: true }
diff --git a/app/models/repository_protected_branche.rb b/app/models/repository_protected_branche.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class RepositoryProtectedBranche < ActiveRecord::Base
+class RepositoryProtectedBranche < RedmineGitHosting.old_redmine? ? ActiveRecord::Base : ApplicationRecord
   include Redmine::SafeAttributes
   VALID_PERMS  = ['RW+', 'RW', 'R', '-'].freeze
   DEFAULT_PERM = 'RW+'
diff --git a/db/migrate/20150823030100_migrate_protected_branches_users.rb b/db/migrate/20150823030100_migrate_protected_branches_users.rb
@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
 class RepositoryProtectedBrancheWrapped < RepositoryProtectedBranche
-  serialize :user_list, Array
+  if RedmineGitHosting.old_redmine?
+    serialize :user_list, Array
+  else
+    serialize :user_list, type: Array
+  end
 end
 
 class MigrateProtectedBranchesUsers < ActiveRecord::Migration[4.2]
diff --git a/lib/redmine_git_hosting.rb b/lib/redmine_git_hosting.rb
@@ -55,4 +55,16 @@ def additionals_help_items
        url: 'http://redmine-git-hosting.io/how-to/',
        admin: true }]
   end
+
+  def old_redmine?
+    Gem::Version.new(Redmine::VERSION) < Gem::Version.new("6.0.0")
+  end
+
+  def old_additionals?
+    if old_redmine?
+      true
+    else
+      Gem::Version.new(Additionals::VERSION) < Gem::Version.new("4.2.0")
+    end
+  end
 end
diff --git a/lib/redmine_git_hosting/markdown_renderer.rb b/lib/redmine_git_hosting/markdown_renderer.rb
@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
+if RedmineGitHosting.old_redmine?
+  require 'task_list/filter'
+  require 'task_list/railtie'
+end
+
 require 'html/pipeline'
-require 'task_list/filter'
-require 'task_list/railtie'
 
 module RedmineGitHosting
   module MarkdownRenderer
@@ -18,11 +21,19 @@ def pipeline
       HTML::Pipeline.new filters
     end
 
-    def filters
-      [RedmineGitHosting::RedcarpetFilter,
-       TaskList::Filter,
-       HTML::Pipeline::AutolinkFilter,
-       HTML::Pipeline::TableOfContentsFilter]
+    if RedmineGitHosting.old_redmine?
+      def filters
+        [RedmineGitHosting::RedcarpetFilter,
+         TaskList::Filter,
+         HTML::Pipeline::AutolinkFilter,
+         HTML::Pipeline::TableOfContentsFilter]
+      end
+    else
+      def filters
+        [RedmineGitHosting::RedcarpetFilter,
+         HTML::Pipeline::AutolinkFilter,
+         HTML::Pipeline::TableOfContentsFilter]
+      end
     end
   end
 end
diff --git a/lib/redmine_git_hosting/patches/projects_controller_patch.rb b/lib/redmine_git_hosting/patches/projects_controller_patch.rb
@@ -10,7 +10,13 @@ module ProjectsControllerPatch
       def self.prepended(base)
         base.class_eval do
           helper :git_hosting
-          helper :additionals_clipboardjs
+
+          if RedmineGitHosting.old_additionals?
+            helper :additionals_clipboardjs
+          else
+            helper :additionals_clipboard
+          end
+
           helper :extend_projects
         end
       end
diff --git a/lib/redmine_git_hosting/patches/repositories_controller_patch.rb b/lib/redmine_git_hosting/patches/repositories_controller_patch.rb
@@ -11,7 +11,13 @@ def self.prepended(base)
           before_action :set_current_tab, only: :edit
 
           helper :git_hosting
-          helper :additionals_clipboardjs
+
+          if RedmineGitHosting.old_additionals?
+            helper :additionals_clipboardjs
+          else
+            helper :additionals_clipboard
+          end
+
           helper :watchers
 
           # Load ExtendRepositoriesHelper so we can call our
diff --git a/spec/models/gitolite_public_key_spec.rb b/spec/models/gitolite_public_key_spec.rb
