Uxupgrade as optional without theme copying so login bg can be patched by docker binding.
All checks were successful
continuous-integration/drone/push Build is passing

Workload remove unnecessary patch.
This commit is contained in:
2023-03-28 20:52:36 +02:00
parent b7c63f3185
commit 45242a5e0f
2 changed files with 13 additions and 10 deletions

View File

@@ -1,5 +1,18 @@
--- a/plugins/000_redmine_x_ux_upgrade/init.rb
+++ b/plugins/000_redmine_x_ux_upgrade/init.rb
@@ -34,10 +34,10 @@ plugin_path = Redmine::Plugin.registered_plugins[:'000_redmine_x_ux_upgrade'].pa
require "#{plugin_path}/lib/redmine_x_ux_upgrade"
# Copy projectino theme and to public folder
-FileUtils.cp_r("#{plugin_path}/assets/themes", "#{Rails.root}/public")
+#FileUtils.cp_r("#{plugin_path}/assets/themes", "#{Rails.root}/public")
# Set redmine theme to 'redminex_theme'
-RedmineXUxUpgrade.set_redmine_x_theme
+#RedmineXUxUpgrade.set_redmine_x_theme
# Save additional default settings if this is upgrade of older version # for Redmine v5.0.2
RedmineXUxUpgrade.save_default_settings
@@ -50,5 +50,5 @@ RedmineApp::Application.routes.prepend do
post '/settings/plugin/000_redmine_x_ux_upgrade/remove_logo', to: 'settings#delete_attachment', as: 'delete_attachment'
end

View File

@@ -308,16 +308,6 @@
Redmine::Export::CSV.generate(encoding: params[:encoding]) do |csv|
csv << prepare.header_fields
prepare.group_workload.each do |level, data|
--- a/plugins/redmine_workload/test/test_helper.rb
+++ b/plugins/redmine_workload/test/test_helper.rb
@@ -1,5 +1,7 @@
# frozen_string_literal: true
+require 'mocha/minitest'
+
# Load the normal Rails helper
require File.expand_path('../../../test/test_helper', __dir__)
# Load other test helper modules
--- a/plugins/redmine_workload/test/unit/group_user_dummy_test.rb
+++ b/plugins/redmine_workload/test/unit/group_user_dummy_test.rb
@@ -3,7 +3,7 @@