diff --git a/.github/workflows/rubyonrails.yml b/.github/workflows/rubyonrails.yml index 10a58121..ac323a50 100644 --- a/.github/workflows/rubyonrails.yml +++ b/.github/workflows/rubyonrails.yml @@ -21,9 +21,9 @@ name: "GitHub CI" on: push: - branches: ["devel"] + branches: ["master"] pull_request: - branches: ["devel"] + branches: ["master"] jobs: plugin_tests: strategy: diff --git a/CHANGELOG.md b/CHANGELOG.md index ca88caae..97190e96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,13 @@ Changelog for Redmine DMSF ========================== -3.2.0 *????-??-??* +3.2.0 *2024-04-23* ------------------ + Redmine Product plugin compatibility + +* Bug: #1537 - SystemStackError when Redmine Products plugin installed + 3.1.9 *2024-07-18* ------------------ diff --git a/README.md b/README.md index cf191b3f..2be125c9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -Redmine DMSF Plugin 3.2.0 devel -=============================== +Redmine DMSF Plugin 3.2.0 +========================= -[![GitHub CI](https://github.com/danmunn/redmine_dmsf/actions/workflows/rubyonrails.yml/badge.svg?branch=devel)](https://github.com/danmunn/redmine_dmsf/actions/workflows/rubyonrails.yml) +[![GitHub CI](https://github.com/danmunn/redmine_dmsf/actions/workflows/rubyonrails.yml/badge.svg?branch=master)](https://github.com/danmunn/redmine_dmsf/actions/workflows/rubyonrails.yml) [![Support Ukraine Badge](https://bit.ly/support-ukraine-now)](https://github.com/support-ukraine/support-ukraine) Redmine DMSF is Document Management System Features plugin for Redmine issue tracking system; It is aimed to replace current Redmine's Documents module. diff --git a/init.rb b/init.rb index e607a897..60091c22 100644 --- a/init.rb +++ b/init.rb @@ -24,7 +24,7 @@ Redmine::Plugin.register :redmine_dmsf do author_url 'https://github.com/danmunn/redmine_dmsf/graphs/contributors' author 'Vít Jonáš / Daniel Munn / Karel Pičman' description 'Document Management System Features' - version '3.2.0 devel' + version '3.2.0' requires_redmine version_or_higher: '5.0.0' diff --git a/lib/redmine_dmsf/plugin.rb b/lib/redmine_dmsf/plugin.rb index 275c58b3..d032e8e0 100644 --- a/lib/redmine_dmsf/plugin.rb +++ b/lib/redmine_dmsf/plugin.rb @@ -31,8 +31,8 @@ module RedmineDmsf # present. # It is related especially to plugins made by AlphaNode and RedmineUP. def self.an_obsolete_plugin_present? - plugins = %w[easyproject/easy_plugins/easy_money redmine_questions redmine_db redmine_passwords redmine_resources - redmine_products] + plugins = %w[easyproject/easy_plugins/easy_money redmine_questions redmine_db redmine_passwords redmine_resources] + #redmine_products] plugins.each do |plugin| return true if Plugin.present?(plugin) end