The attached patch works around the failure to display comments on diffs.
It has been submitted and included upstream already, see: - https://gitlab.com/gitlab-org/gitlab/-/issues/374174#note_1238695337 - https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108902
diff --git a/config/application.rb b/config/application.rb
index a3fe4935fdf..88fd66f0baf 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -595,6 +595,15 @@ class Application < Rails::Application
Gitlab::Color, # https://gitlab.com/gitlab-org/gitlab/-/issues/368844,
Hashie::Array # https://gitlab.com/gitlab-org/gitlab/-/issues/378089
]
+ #
+ # it seems that setting config.active_record.yaml_column_permitted_classes in an after_initialize does not update
+ # the value in ActiveRecord::Base.yaml_column_permitted_classes. We can not move the setting of
+ # config.active_record.yaml_column_permitted_classes out of the after_initialize because then the gitlab classes
+ # are not loaded yet.
+ #
+ # Manually set ActiveRecord::Base.yaml_column_permitted_classes
+ #
+ ActiveRecord::Base.yaml_column_permitted_classes = config.active_record.yaml_column_permitted_classes
# on_master_start yields immediately in unclustered environments and runs
# when the primary process is done initializing otherwise.
OpenPGP_signature
Description: OpenPGP digital signature
