diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 53b95868..f2fc799e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,8 @@ Changelog - Support private comments with issue macro - Google Docs macro has been added - Fix bug with Rack 2.0.8 or newer +- Drop Redmine 3.4 support +- Add Redmine 4.1 support 2.0.22 ++++++ diff --git a/app/views/additionals/_settings_list_defaults.html.slim b/app/views/additionals/_settings_list_defaults.html.slim index f618ced8..b21b5c9f 100644 --- a/app/views/additionals/_settings_list_defaults.html.slim +++ b/app/views/additionals/_settings_list_defaults.html.slim @@ -2,12 +2,8 @@ fieldset.box legend = l(:additionals_query_list_defaults) - setting_name_columns = "#{query_type}_list_defaults" - query = query_class.new(@settings[setting_name_columns.to_sym]) - - if Redmine::VERSION.to_s >= '4' - .default-query-settings-label-redmine4 - = render_query_columns_selection(query, name: "settings[#{setting_name_columns}][column_names]") - - else - .default-query-settings-label - = render_query_columns_selection(query, name: "settings[#{setting_name_columns}][column_names]") + .default-query-settings-label + = render_query_columns_selection(query, name: "settings[#{setting_name_columns}][column_names]") - columns = query_class.new.available_totalable_columns - if columns.count.positive? diff --git a/assets/stylesheets/additionals.css b/assets/stylesheets/additionals.css index d6e46ea9..fc7b2d5f 100644 --- a/assets/stylesheets/additionals.css +++ b/assets/stylesheets/additionals.css @@ -157,13 +157,8 @@ div.clear-both { clear: both; } -/* for Redmine 3.4 - fix problem with tabs */ +/* fix problem with tabs */ .default-query-settings-label label { - margin-left: -100px !important; -} - -/* for Redmine 4.x - fix problem with tabs */ -.default-query-settings-label-redmine4 label { width: 250px !important; margin-left: 0 !important; float: none; diff --git a/docs/index.rst b/docs/index.rst index 9d70f94b..de07e27b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -38,9 +38,9 @@ Requirements ------------ +--------------------+----------------------+ -| `Redmine`_ version | >= 3.4.0 | +| `Redmine`_ version | >= 4.0.0 | +--------------------+----------------------+ -| `Ruby`_ version | >= 2.3.0 | +| `Ruby`_ version | >= 2.4.0 (2.3.x should work, but untested) | +--------------------+----------------------+ | Gem packages | see `Gemfile`_ | +--------------------+----------------------+ diff --git a/init.rb b/init.rb index 96f30098..ace3b7e5 100644 --- a/init.rb +++ b/init.rb @@ -33,7 +33,7 @@ Redmine::Plugin.register :additionals do end # required redmine version - requires_redmine version_or_higher: '3.4.0' + requires_redmine version_or_higher: '4.0.0' menu :admin_menu, :additionals, { controller: 'settings', action: 'plugin', id: 'additionals' }, caption: :label_additionals