git: b08aac2a1e4b - 2022Q3 - www/gitlab-ce: whitelist classes to fix problem related to rails 6.1.6.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 25 Aug 2022 13:21:13 UTC
The branch 2022Q3 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=b08aac2a1e4bf2cb9aa49b8e406950f8471c868a commit b08aac2a1e4bf2cb9aa49b8e406950f8471c868a Author: Yasuhito FUTATSUKI <freebsd-bug-report-yf@yf.bsdclub.org> AuthorDate: 2022-08-18 20:59:45 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2022-08-25 13:20:20 +0000 www/gitlab-ce: whitelist classes to fix problem related to rails 6.1.6.1 PR: 265314 (cherry picked from commit ea7afbecaab1f910ce1b7cbb776cfcf04ef387bb) --- www/gitlab-ce/files/patch-config_application.rb | 28 +++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/www/gitlab-ce/files/patch-config_application.rb b/www/gitlab-ce/files/patch-config_application.rb new file mode 100644 index 000000000000..f6cccb30f2dc --- /dev/null +++ b/www/gitlab-ce/files/patch-config_application.rb @@ -0,0 +1,28 @@ +--- config/application.rb.orig 2022-08-18 20:56:35 UTC ++++ config/application.rb +@@ -532,6 +532,25 @@ module Gitlab + + # DO NOT PLACE ANY INITIALIZERS AFTER THIS. + config.after_initialize do ++ # for Rails v6.1.6.1, brought from ++ # https://gitlab.com/gitlab-org/gitlab/-/blob/e8bf6ca8f8ce38618b8e919a37b56cebc1e28773/config/application.rb ++ config.active_record.yaml_column_permitted_classes = [ ++ Symbol, Date, Time, ++ BigDecimal, # https://gitlab.com/gitlab-org/gitlab/issues/368846 ++ Gitlab::Diff::Position, ++ # Used in: ++ # app/models/concerns/diff_positionable_note.rb ++ # app/models/legacy_diff_note.rb: serialize :st_diff ++ ActiveSupport::HashWithIndifferentAccess, ++ # Used in ee/lib/ee/api/helpers.rb: send_git_archive ++ DeployToken, ++ ActiveModel::Attribute.const_get(:FromDatabase, false), # https://gitlab.com/gitlab-org/gitlab/-/issues/368072 ++ # Used in app/services/web_hooks/log_execution_service.rb: log_execution ++ ActiveSupport::TimeWithZone, ++ ActiveSupport::TimeZone, ++ Gitlab::Color # https://gitlab.com/gitlab-org/gitlab/-/issues/368844 ++ ] ++ + # on_master_start yields immediately in unclustered environments and runs + # when the primary process is done initializing otherwise. + Gitlab::Cluster::LifecycleEvents.on_master_start do