diff --git a/.github/workflows/rubyonrails.yml b/.github/workflows/rubyonrails.yml index 7a9c0f8c..4e30c89f 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: @@ -47,7 +47,7 @@ jobs: sql3: GRANT ALL PRIVILEGES ON test.* TO 'redmine'@'localhost'; # SQL client command database_command: mysql -uroot -proot -e - # SQl service + # SQL service database_service: mysql - engine: postgresql # Database configuration for Redmine diff --git a/CHANGELOG.md b/CHANGELOG.md index 394bb3f2..e2f43f69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,17 @@ Changelog for Redmine DMSF ========================== -4.0.2 *????-??-??* +4.0.2 *2025-01-30* ------------------ -4.0.1 *2024-01-17* + Moving folders fix + Coloured system sub-folders + +* Bug: #1585 - Move X Copy +* Bug: #1580 - Can't upgrade plugin to 4.0.1 after upgrading redmine to 6.0.2 +* Bug: #1557 - Editing of locked folder + +4.0.1 *2025-01-17* ------------------ Coloured icons diff --git a/README.md b/README.md index fd77b13a..8b645cb1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Redmine DMSF Plugin 4.0.2 -[![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 d1d8998c..c2a13462 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 '4.0.2 devel' + version '4.0.2' requires_redmine version_or_higher: '6.0.0'