Merge branch 'master' into devel-1.6.2

2018-04-24 11:53:45 +02:00 · 2018-04-24 11:53:45 +02:00 · 06f325d9da
commit 06f325d9da
parent c974287683 44420bd513
3 changed files with 2 additions and 3 deletions
--- a/app/models/dmsf_folder.rb
+++ b/app/models/dmsf_folder.rb
@ -1,5 +1,4 @@
 # encoding: utf-8
-# encoding: utf-8
 #
 # Redmine plugin for Document Management System "Features"
 #
--- a/lib/redmine_dmsf/patches/custom_fields_helper_patch.rb
+++ b/lib/redmine_dmsf/patches/custom_fields_helper_patch.rb
@ -47,5 +47,5 @@ module RedmineDmsf
  end
 end

-RedmineExtensions::PatchManager.register_concern_patch 'CustomFieldsHelper',
+RedmineExtensions::PatchManager.register_helper_patch 'CustomFieldsHelper',
    'RedmineDmsf::Patches::CustomFieldsHelperPatch', prepend: true
--- a/lib/redmine_dmsf/patches/projects_helper_patch.rb
+++ b/lib/redmine_dmsf/patches/projects_helper_patch.rb
@ -41,5 +41,5 @@ module RedmineDmsf
  end
 end

-RedmineExtensions::PatchManager.register_concern_patch 'ProjectsHelper',
+RedmineExtensions::PatchManager.register_helper_patch 'ProjectsHelper',
    'RedmineDmsf::Patches::ProjectHelperPatch', prepend: true