Implement Redmine 6.0 compatibility with Rails 7, selective model inheritance, and WikiFormatting integration

.github/workflows/test.yml

@@ -11,8 +11,8 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.7', '3.0', '3.1']
-        redmine: ['5.0-stable', 'master']
+        ruby: ['3.0', '3.1', '3.2', '3.3']
+        redmine: ['6.0-stable', 'master']
         db: ['postgres', 'mysql']
       fail-fast: false
 

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 7.0.0 - TBD
+
+### Added
+
+- Support for Redmine 6.0
+
+### Changed
+
+- Update all models to inherit from ApplicationRecord instead of ActiveRecord::Base
+- Fix serialize syntax for Rails 7 compatibility using `type:` parameter
+- Update minimum Ruby version requirement to 3.0+
+
+### BREAKING CHANGE
+
+- Redmine 6.0+ is required
+- Ruby 3.0+ is required
+- Removed support for Redmine 5.x
+
 ## 6.0.1 - 2022-11-04
 
 ### Changed

app/models/git_cache.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class GitCache < ActiveRecord::Base
+class GitCache < (defined?(ApplicationRecord) == 'constant' ? ApplicationRecord : ActiveRecord::Base)
   include Redmine::SafeAttributes
 
   CACHE_ADAPTERS = [%w[Database database],

app/models/github_comment.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class GithubComment < ActiveRecord::Base
+class GithubComment < (defined?(ApplicationRecord) == 'constant' ? ApplicationRecord : ActiveRecord::Base)
   ## Relations
   belongs_to :journal
 

app/models/github_issue.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class GithubIssue < ActiveRecord::Base
+class GithubIssue < (defined?(ApplicationRecord) == 'constant' ? ApplicationRecord : ActiveRecord::Base)
   ## Relations
   belongs_to :issue
 

app/models/gitolite_public_key.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class GitolitePublicKey < ActiveRecord::Base
+class GitolitePublicKey < (defined?(ApplicationRecord) == 'constant' ? ApplicationRecord : ActiveRecord::Base)
   include Redmine::SafeAttributes
 
   TITLE_LENGTH_LIMIT = 60

app/models/protected_branches_member.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class ProtectedBranchesMember < ActiveRecord::Base
+class ProtectedBranchesMember < (defined?(ApplicationRecord) == 'constant' ? ApplicationRecord : ActiveRecord::Base)
   include Redmine::SafeAttributes
 
   ## Attributes

app/models/repository_deployment_credential.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class RepositoryDeploymentCredential < ActiveRecord::Base
+class RepositoryDeploymentCredential < (defined?(ApplicationRecord) == 'constant' ? ApplicationRecord : ActiveRecord::Base)
   include Redmine::SafeAttributes
 
   VALID_PERMS  = ['R', 'RW+'].freeze

app/models/repository_git_config_key.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class RepositoryGitConfigKey < ActiveRecord::Base
+class RepositoryGitConfigKey < (defined?(ApplicationRecord) == 'constant' ? ApplicationRecord : ActiveRecord::Base)
   include Redmine::SafeAttributes
 
   ## Attributes

app/models/repository_git_extra.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-class RepositoryGitExtra < ActiveRecord::Base
+class RepositoryGitExtra < (defined?(ApplicationRecord) == 'constant' ? ApplicationRecord : ActiveRecord::Base)
   include Redmine::SafeAttributes
+  include Redmine::I18n
 
   SMART_HTTP_OPTIONS = [[l(:label_disabled), '0'],
                         [l(:label_http_only), '3'],
@@ -33,7 +34,7 @@ class RepositoryGitExtra < ActiveRecord::Base
   validate :validate_urls_order
 
   ## Serializations
-  serialize :urls_order, Array
+  serialize :urls_order, type: Array
 
   ## Callbacks
   before_save :check_urls_order_consistency

app/models/repository_mirror.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class RepositoryMirror < ActiveRecord::Base
+class RepositoryMirror < (defined?(ApplicationRecord) == 'constant' ? ApplicationRecord : ActiveRecord::Base)
   include Redmine::SafeAttributes
 
   PUSHMODE_MIRROR       = 0

app/models/repository_post_receive_url.rb

@@ -2,7 +2,7 @@
 
 require 'uri'
 
-class RepositoryPostReceiveUrl < ActiveRecord::Base
+class RepositoryPostReceiveUrl < (defined?(ApplicationRecord) == 'constant' ? ApplicationRecord : ActiveRecord::Base)
   include Redmine::SafeAttributes
 
   ## Attributes
@@ -22,7 +22,7 @@ class RepositoryPostReceiveUrl < ActiveRecord::Base
   validates :mode, presence: true, inclusion: { in: %i[github get post] }
 
   ## Serializations
-  serialize :triggers, Array
+  serialize :triggers, type: Array
 
   ## Scopes
   scope :active, -> { where active: true }

app/models/repository_protected_branche.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class RepositoryProtectedBranche < ActiveRecord::Base
+class RepositoryProtectedBranche < (defined?(ApplicationRecord) == 'constant' ? ApplicationRecord : ActiveRecord::Base)
   include Redmine::SafeAttributes
   VALID_PERMS  = ['RW+', 'RW', 'R', '-'].freeze
   DEFAULT_PERM = 'RW+'

db/migrate/20150823030100_migrate_protected_branches_users.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class RepositoryProtectedBrancheWrapped < RepositoryProtectedBranche
-  serialize :user_list, Array
+  serialize :user_list, type: Array
 end
 
 class MigrateProtectedBranchesUsers < ActiveRecord::Migration[4.2]

init.rb

@@ -11,7 +11,7 @@
   author_url  'settings/plugin/redmine_git_hosting/authors'
 
   settings partial: 'settings/redmine_git_hosting', default: RedmineGitHosting.settings
-  requires_redmine version_or_higher: '4.1.0'
+  requires_redmine version_or_higher: '6.0.0'
 
   permission :create_gitolite_ssh_key, gitolite_public_keys: %i[index create destroy], require: :loggedin
 

lib/redmine_git_hosting.rb

@@ -6,7 +6,7 @@
 module RedmineGitHosting
   extend self
 
-  VERSION = '6.0.1'
+  VERSION = '7.0.0'
 
   # Load RedminePluginLoader
   extend RedminePluginLoader