diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f6330e6..a962d79 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,12 +10,9 @@ jobs: strategy: matrix: - ruby: ['3.0', '3.1', '3.2'] - redmine: ['5.0-stable', '5.1-stable', 'master'] + ruby: ['3.1', '3.2', '3.3'] + redmine: ['6.0-stable', 'master'] db: ['postgres', 'mysql'] - exclude: - - ruby: '3.2' - redmine: 5.0-stable fail-fast: false services: diff --git a/.rubocop.yml b/.rubocop.yml index 6d8e3d9..22f7806 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,8 +4,8 @@ require: - rubocop-minitest AllCops: - TargetRubyVersion: 2.7 - TargetRailsVersion: 6.1 + TargetRubyVersion: 3.1 + TargetRailsVersion: 7.2 NewCops: enable Rails: diff --git a/app/helpers/privacy_terms_helper.rb b/app/helpers/privacy_terms_helper.rb index 5ebd70a..dda9614 100644 --- a/app/helpers/privacy_terms_helper.rb +++ b/app/helpers/privacy_terms_helper.rb @@ -54,7 +54,7 @@ def privacy_terms_inspect_results id: 'public_projects', value: public_projects, result: inspect_bool_result(public_projects.zero?, - down_icon: 'fas_info', + down_icon: 'details', down_class: 'summary') } rc @@ -63,13 +63,14 @@ def privacy_terms_inspect_results private def inspect_bool_result(value, down_icon: nil, down_class: nil) - down_icon ||= 'far_thumbs-down' + down_icon ||= 'thumb-down' down_class ||= 'additionals-number-negative inspect-problem' if value - font_awesome_icon 'far_thumbs-up', class: 'additionals-number-positive inspect-good' + # font_awesome_icon 'far_thumbs-up', class: 'additionals-number-positive inspect-good' + svg_icon_tag 'thumb-up', css_class: 'additionals-number-positive inspect-good' else - font_awesome_icon down_icon, class: down_class + svg_icon_tag down_icon, css_class: down_class end end end diff --git a/app/views/redmine_privacy_terms/settings/_inspect.html.slim b/app/views/redmine_privacy_terms/settings/_inspect.html.slim index 4ea5a02..a37d2d2 100644 --- a/app/views/redmine_privacy_terms/settings/_inspect.html.slim +++ b/app/views/redmine_privacy_terms/settings/_inspect.html.slim @@ -17,5 +17,5 @@ table - else td = result[:name] td = result[:value] - td = result[:result] + td.a-icon = result[:result] = call_hook :view_privacy_terms_inspect diff --git a/init.rb b/init.rb index b073008..739743e 100644 --- a/init.rb +++ b/init.rb @@ -9,9 +9,10 @@ version RedminePrivacyTerms::VERSION author 'AlphaNodes GmbH' author_url 'https://alphanodes.com/' + requires_redmine version_or_higher: '6.0' begin - requires_redmine_plugin :additionals, version_or_higher: '3.2.0' + requires_redmine_plugin :additionals, version_or_higher: '4.0.0' rescue Redmine::PluginNotFound raise 'Please install additionals plugin (https://github.com/alphanodes/additionals)' end