Skip to content

Commit 3b813c0

Browse files
Update for redmine 6
1 parent 6084d88 commit 3b813c0

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

.rubocop.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ require:
44
- rubocop-minitest
55

66
AllCops:
7-
TargetRubyVersion: 2.7
8-
TargetRailsVersion: 6.1
7+
TargetRubyVersion: 3.1
8+
TargetRailsVersion: 7.2
99
NewCops: enable
1010

1111
Rails:
@@ -86,7 +86,6 @@ Style/AutoResourceCleanup:
8686
Style/ExpandPathArguments:
8787
Enabled: true
8888
Exclude:
89-
- additionals.gemspec
9089
- test/**/*
9190

9291
Style/FrozenStringLiteralComment:
@@ -105,7 +104,7 @@ Style/OptionHash:
105104
- parameters
106105
- settings
107106
Exclude:
108-
- lib/additionals/patches/*.rb
107+
- lib/redmine_issue_view_columns/patches/*.rb
109108

110109
# postgresql and mysql are supported
111110
# autodetect does not work without database configuration
@@ -139,10 +138,6 @@ Naming/VariableNumber:
139138
Exclude:
140139
- 'test/**/*'
141140

142-
Style/StringConcatenation:
143-
Exclude:
144-
- 'app/views/additionals/_select2_ajax_call.*'
145-
146141
# see https://github.com/rubocop/rubocop-rails/issues/578
147142
# redmine does not use load_defaults: https://rails.rubystyle.guide/#config-defaults
148143
Rails/RedundantPresenceValidationOnBelongsTo:

app/models/issue_view_column.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
class IssueViewColumn < AdditionalsApplicationRecord
3+
class IssueViewColumn < ApplicationRecord
44
belongs_to :project
55

66
scope :sorted, -> { order :position }

init.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
author_url 'https://alphanodes.com/'
1010
description 'Customize shown columns in subtasks and related issues on issue page'
1111
version RedmineIssueViewColumns::VERSION
12-
requires_redmine version_or_higher: '5.0'
12+
requires_redmine version_or_higher: '5.1' # redmine 6.0 is required, but version is not set in redmine source yet
1313

1414
begin
15-
requires_redmine_plugin :additionals, version_or_higher: '3.2.0'
15+
requires_redmine_plugin :additionals, version_or_higher: '4.0.0'
1616
rescue Redmine::PluginNotFound
1717
raise 'Please install additionals plugin (https://github.com/alphanodes/additionals)'
1818
end

0 commit comments

Comments
 (0)