Update CI config: add Redmine 6 and drop support of Redmine 4

Author: nanego

.github/workflows/5_1_3.yml renamed to .github/workflows/5_1_5.yml

@@ -1,8 +1,8 @@
-name: Tests 5.1.3
+name: Tests 5.1.5
 
 env:
   PLUGIN_NAME: redmine_datetime_custom_field
-  REDMINE_VERSION: 5.1.3
+  REDMINE_VERSION: 5.1.5
   RAILS_ENV: test
 
 on:

.github/workflows/4_2_11.yml renamed to .github/workflows/6_0_2.yml

@@ -1,8 +1,8 @@
-name: Tests 4.2.11
+name: Tests 6.0.2
 
 env:
   PLUGIN_NAME: redmine_datetime_custom_field
-  REDMINE_VERSION: 4.2.11
+  REDMINE_VERSION: 6.0.2
   RAILS_ENV: test
 
 on:
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.7']
+        ruby: ['3.3']
         db: ['postgres']
       fail-fast: false
 
@@ -89,12 +89,9 @@ jobs:
       - name: Prepare Redmine source
         working-directory: redmine
         run: |
-          # TODO Remove the following line when https://www.redmine.org/issues/40551 is fixed
-          sed -i -e 's/.*mocha.*/  gem "mocha", "2.1.0"/' Gemfile # Fix core tests not compatible with Mocha 2.2.0
           sed -i '/rubocop/d' Gemfile
           rm -f .rubocop*
           cp plugins/redmine_base_rspec/spec/support/database-${{ matrix.db }}.yml config/database.yml
-          echo 'gem "builder", "~> 3.2.4"' >> Gemfile
 
       - name: Install Ruby dependencies
         working-directory: redmine

.github/workflows/master.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['3.2']
+        ruby: ['3.3']
         db: ['postgres']
       fail-fast: false
 

README.md

@@ -12,11 +12,11 @@ Note that this plugin has a dependency. You have to install this other plugin:
 
 |Plugin branch| Redmine Version | Test Status       |
 |-------------|-----------------|-------------------|
-|master       | 4.2.11          | [![4.2.11][1]][5] |
-|master       | 5.1.3           | [![5.1.3][2]][5]  |
+|master       | 6.0.2           | [![6.0.2][1]][5]  |
+|master       | 5.1.5           | [![5.1.5][2]][5]  |
 |master       | master          | [![master][4]][5] |
 
-[1]: https://github.com/nanego/redmine_datetime_custom_field/actions/workflows/4_2_11.yml/badge.svg
-[2]: https://github.com/nanego/redmine_datetime_custom_field/actions/workflows/5_1_3.yml/badge.svg
+[1]: https://github.com/nanego/redmine_datetime_custom_field/actions/workflows/6_0_2.yml/badge.svg
+[2]: https://github.com/nanego/redmine_datetime_custom_field/actions/workflows/5_1_5.yml/badge.svg
 [4]: https://github.com/nanego/redmine_datetime_custom_field/actions/workflows/master.yml/badge.svg
 [5]: https://github.com/nanego/redmine_datetime_custom_field/actions

init.rb

@@ -13,3 +13,10 @@
 
 # Custom patches
 require_relative 'lib/redmine_datetime_custom_field/hooks'
+
+# Support for Redmine 5
+if Redmine::VERSION::MAJOR < 6
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+  end
+end

lib/redmine_datetime_custom_field/custom_field_patch.rb

@@ -5,7 +5,6 @@ module CustomFieldPatch
     def self.included(base)
       base.send(:include, InstanceMethods)
       base.class_eval do
-        unloadable
         safe_attributes 'show_hours', 'show_shortcut'
       end
     end

lib/redmine_datetime_custom_field/query_patch.rb

@@ -4,7 +4,7 @@
 module RedmineDatetimeCustomField::QueryPatch
 end
 
-class Query < ActiveRecord::Base
+class Query < ApplicationRecord
 
   def validate_query_filters
     filters.each_key do |field|