Merge remote-tracking branch 'origin/release/14.2' into dev

config/initializers/appsignal.rb

@@ -50,10 +50,6 @@
     # Send our logs to appsignal
     if OpenProject::Appsignal.logging_enabled?
       appsignal_logger = Appsignal::Logger.new("rails")
-      original_formatter = appsignal_logger.formatter || Logger::Formatter.new
-      appsignal_logger.formatter = proc { |severity, time, progname, msg|
-        original_formatter.call(severity, time, progname, msg.to_s)
-      }
       Rails.logger.broadcast_to(appsignal_logger)
     end
 

docs/release-notes/14-2-0/README.md

@@ -115,12 +115,7 @@ With OpenProject 14.2, [embedded attributes within a work package description](h
 <!-- Warning: Anything above this line will be automatically removed by the release script -->
 
 ## Contributions
-A very special thank you goes to our sponsors for features and improvements of this release:
-
-- German Federal Ministry of the Interior and Home Affairs (BMI) for sponsoring the features on progress reporting
-- City of Cologne for sponsoring features on project attributes
-
-Also a big thanks to our Community members for reporting bugs and helping us identify and provide fixes. Special thanks for reporting and finding  bugs go to Ricardo Brenner and Sven Kunze.
+A very special thank you goes to the City of Cologne for sponsoring features on project attributes. Also a big thanks to our Community members for reporting bugs and helping us identify and provide fixes. Special thanks for reporting and finding  bugs go to Ricardo Brenner and Sven Kunze.
 
 Last but not least, we are very grateful for our very engaged translation contributors on Crowdin, who translated quite a few OpenProject strings! This release we would like to highlight user [aniessalam](https://crowdin.com/profile/aniessalam) who has done an outstanding number of translations for the Malay language in recent weeks.
 

docs/system-admin-guide/projects/project-attributes/README.md

@@ -72,6 +72,30 @@ You can also use the drag handles to the left of each project attribute to drag
 
 >**Note**: Project admins can chose to enable or disable a project attribute from their project, but they cannot change the order. The order set in this page is the order in which they will appear in all projects.
 
+
+
+## Enable project attributes
+
+Under **Administration settings** → **Projects** → **Project attributes** select the *More* menu and select *Edit* or simply clicking on the name of the project attribute. This will open a detailed view of the project attribute you selected. 
+
+The *Details* tab will allow you to edit the name, section and visibility. 
+
+![OpenProject project attribute details editing](open_project_system_admin_guide_project_attributes_details.png)
+
+The *Enabled in projects* tab will show a list of all the projects this project attributes was activated in. 
+
+![Project attributes enabled in projects list in OpenProject administration](open_project_system_admin_guide_project_attributes_enabled_in_projects.png)
+
+You can remove a project attribute from a specific project by selecting the **More** menu at the end of the line and clicking the *Deactivate for this project* option.
+
+![Deactivate a project attribute for a project in OpenProject administration](open_project_system_admin_guide_project_attributes_deactivate_for_project.png)
+
+To add this project attribute to a specific project click the **+Add projects** button. A modal will appear allowing you to search for projects to add this project attribute into. Please note, that the projects, in which the project attribute is already activated will be shown disabled in that selection. You can include subprojects. 
+
+![ Configure which projects are activated for a project attribute in OpenProject administration](open_project_system_admin_guide_project_attributes_add.png)
+
+> **Note**: please note, that it is not possible to add or remove a project attribute, if a project attribute is set to be required.
+
 ## Sections
 
 You can group project attributes into sections to better organize them.