From nobody Wed Aug 24 04:23:36 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MCCdh2Njkz4b7Lq; Wed, 24 Aug 2022 04:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MCCdh1qS3z3Cyn; Wed, 24 Aug 2022 04:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661315016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r/tGDZE2hWo3e/sWGU9sV8gzOW8vnYAGm3R3IjBmrsY=; b=Sa8k5K34IVVyeX71vaO7uytLnBaTEUzp+AXt5vx1mJt8z25P4ckmxNakUWd9711RybKq8F 9ajl7muY6jQw8mFeuBH1V6ZYPfzuQWjg/9Cswrt3fgA1jgA2GW7UkkSwrl13fH1j8oybBP DxbSNXlsalknoR3ui6Hic0b25Cx1GO3KXRg7sP9KJ5ZAVIRDL1kjK8cPKtqe60qS/7+bSM xHmTj1flLnJOCj+y7Dq/W/ujjHnlzbkKzY8o73sJsIDsZo1t7QnuixqZNC6r7UI/dVJPcH bheAIYQX64PauEdWrxg2Pd2ytNVlV5R3Qf5M7pHabGxvdsI4cjeM8uCX8zZgUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MCCdh0wVtzwQF; Wed, 24 Aug 2022 04:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27O4Na4I097626; Wed, 24 Aug 2022 04:23:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27O4Na1W097625; Wed, 24 Aug 2022 04:23:36 GMT (envelope-from git) Date: Wed, 24 Aug 2022 04:23:36 GMT Message-Id: <202208240423.27O4Na1W097625@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: ea7afbecaab1 - main - www/gitlab-ce: whitelist classes to fix problem related to rails 6.1.6.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea7afbecaab1f910ce1b7cbb776cfcf04ef387bb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661315016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r/tGDZE2hWo3e/sWGU9sV8gzOW8vnYAGm3R3IjBmrsY=; b=A2CwytqvUvo7MueZTHREMyWACdqm/7EAazXKGN7Mv5MINwgHI7XIB/lo3bxEvdXVVWXetD 6/i/D6i49aCZlj/3oZaOozqsHtYZXDL0DqP2Bo32ts0yeqC5yGy8wKpyuJYMXYMSExlz0r YNJDRlzEs0CFztkHhWhr0C5tN/mnbBdZ75JVlvqjQKZUHlEyqW2iPaiqWepVz8lT26h1Dd Vl9UQlmk6wB3vJ5RA/P7271rrtGwcVJEOZncx+xtaJRUuFEkCmhOyGkWEAVWa77S/OHs2s EBV+nu2iqjDBab8aAEnmZ7MwrhrPt3O1HFi/UNfL1+LlNMVej5T8UzwwyySC1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661315016; a=rsa-sha256; cv=none; b=GjE4QAVwK5pOUwvUZ6f1XkV/aCgqczdPvh61BsvnS1+KkHqSQz1IYXjhKVp6ZKuZA+CUza DO8vboTyzZ6NikPqfporkEXvgrWhchE7lI14V63D1D5yuWLkRtrY3Ospmyzes3BW+JFwcX 615PRXuZmgkbmHAwSFJFEkHfbXQQdjQ66j8DFPwI1bdl3arO4w3jXShBMLoj88RCqECLTR jL/lxM07ieg5tEQXmKdLsQxHAPBGNa2Fj3/fHMXMHOntfXG2lMxc4KEq4ZkPerEgQiMWAH voX4QejVMM0+yven1y3m2equJa5C24F5HnGgT+W6hm1Y6p0DR5RXs3Zm5HHz1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=ea7afbecaab1f910ce1b7cbb776cfcf04ef387bb commit ea7afbecaab1f910ce1b7cbb776cfcf04ef387bb Author: Yasuhito FUTATSUKI AuthorDate: 2022-08-18 20:59:45 +0000 Commit: Matthias Fechner CommitDate: 2022-08-24 04:22:27 +0000 www/gitlab-ce: whitelist classes to fix problem related to rails 6.1.6.1 PR: 265314 --- 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