From nobody Thu Apr 20 06:57:58 2023 X-Original-To: dev-commits-ports-all@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 4Q27lW20j4z46Q3y; Thu, 20 Apr 2023 06:57:59 +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 4Q27lV6rm7z4DHm; Thu, 20 Apr 2023 06:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681973879; 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=LAQfT5sAzkChkh4HgwDFZCNMISHiXONblqOJjsaq4hs=; b=cD9hF7ip7f0T042+6gG0GjQGt2exshOsyVhRCuhVViRBhYWQ6HqDRw6LlzW6BAAGrcjZ1Z 0X61DZ2WsSfwd1Tg18RA14LhMv7d8ItdIvYI7lIfrhlYJc/ag4bNv5hYDCLo7ddosdh9to 9W1pedzy01wihzkuSqgfQMnxySv/Qg6BdXOb0Y8ACCQgCLA7PjzdTYq78HSmnX1oRvBA66 AI7EfnixzJhNlHNoKFev4rOBgceOiPpeAEHMzT4Ow4f1ezaMdu5IUK+/eamsb5p94+TxmX etMX8Ehgk71cmYFhlgpo7DpF/xuPmZwFAObw/+ZKAGwzchdudKzS7ZxhSDkL2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681973879; 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=LAQfT5sAzkChkh4HgwDFZCNMISHiXONblqOJjsaq4hs=; b=q7ZsKEvsL3MACpf0hZVw0e/KsxaL6ju3QJiAVDASVbboI3mQcyuac9eAqLk7fxQ1s3KTat n1Lj6p2W84x0yox/jbCqIfi5DgmVuphuqsf1TkVz9Xmq8BTH5YqYaxNZTK6fid+68lZCiC ak5EBnTSoDnUi2CKuf58mOw4Qecmx5c8Q9xOd178JKb7Fo1ZQyi1R9fH76JfZQQzmrg5Ea sjMdoAIlMjbpbwKRZRhp58XhMis0PqHxIKvtsp+nEBacUESVWGjYgX3YmQJDFps6qAts1t VVUqUxy+5xq7khQYmp66XDuHankYnqAWkwlKJb50OxoVWXy1lLaL0nSg2ln0zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681973879; a=rsa-sha256; cv=none; b=kYE+uIBRoR+r6ZOYPAUyyT7fUKwNEco3SZczH1L81jVY+z0AVy3FrebXzU5uyKTgtv8atr rdIuGtpYBAA41aCplkA2aKG69lcBUO9ExvP/sVlT1iXQL56sI3yuY5B2NKSyDMCz6JB6H7 KGYsG7XF3MMCEwm7nZeAlIkZ09Ytg6CUrIP8QKLNiiEmhIU5i2S3zSTqjX7zEKTHsIjk3v D9Jt7UAhGWp9FjHF2/3O1rzGoWmMkUTdWNkNODU3pB9hOiiBnbH32TN4oHQolqwPhT5GGa ZCYLnQb/mn7HhnfApXOuXiPVWvFbY6Lfho6J0e3lgTaWgBmhd8hZh8ifQdYneQ== 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 4Q27lV3CSLzRyF; Thu, 20 Apr 2023 06:57:58 +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 33K6vwhU022914; Thu, 20 Apr 2023 06:57:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33K6vw3C022912; Thu, 20 Apr 2023 06:57:58 GMT (envelope-from git) Date: Thu, 20 Apr 2023 06:57:58 GMT Message-Id: <202304200657.33K6vw3C022912@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 940fd3720637 - 2023Q2 - www/gitlab-ce: update to 15.10.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2023Q2 X-Git-Reftype: branch X-Git-Commit: 940fd37206379967bc1b61be5e084f38de73f3fd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=940fd37206379967bc1b61be5e084f38de73f3fd commit 940fd37206379967bc1b61be5e084f38de73f3fd Author: Matthias Fechner AuthorDate: 2023-04-12 13:39:37 +0000 Commit: Matthias Fechner CommitDate: 2023-04-20 02:23:51 +0000 www/gitlab-ce: update to 15.10.2 Changelog: https://about.gitlab.com/releases/2023/04/05/gitlab-15-10-2-released/ (cherry picked from commit f3e532069a198a3bd72cd8e688cda52a5925e3aa) --- devel/gitaly/Makefile | 4 +-- devel/gitaly/distinfo | 10 +++---- www/gitlab-ce/Makefile | 9 ++++--- www/gitlab-ce/distinfo | 6 ++--- www/gitlab-ce/files/patch-Gemfile | 31 ++++++++-------------- .../files/patch-config_gitlab.yml.example | 14 +++++----- .../files/patch-config_initializers_1__settings.rb | 4 +-- .../files/patch-lib_support_nginx_gitlab-ssl | 4 +-- www/gitlab-ce/pkg-message | 4 +-- www/gitlab-pages/Makefile | 4 +-- www/gitlab-pages/distinfo | 10 +++---- www/gitlab-workhorse/Makefile | 4 +-- www/gitlab-workhorse/distinfo | 10 +++---- 13 files changed, 53 insertions(+), 61 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index afa04da339b2..176bc66a660b 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -DISTVERSION= 15.10.1 +DISTVERSION= 15.10.2 PORTREVISION= 0 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -49,7 +49,7 @@ MAKE_ENV+= ${GO_ENV} USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= 267edbe4a3f5416d75b5f0213bbcee9012f7797d +GL_COMMIT= aee76b7fd5b7e2fd68911f2b6b5203ee7512e0fe # for go dependencies # Gitlab hosts there dependencies on their own platform and not on go-proxy diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index 7a9b5c250d35..cd4c0aee3ee4 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1681104389 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0/go.mod) = f9e62b5491c17780d343f8de6921e04e1012858cd7ad6de24a77d38e6d941235 -SIZE (go/devel_gitaly/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0/go.mod) = 10320 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0.tar.gz) = dfc2a54be503458235d45fe771de0402203ea81af176fd3786aadfdf21f499b1 -SIZE (go/devel_gitaly/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0.tar.gz) = 3096478 +TIMESTAMP = 1681126542 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-aee76b7fd5b7e2fd68911f2b6b5203ee7512e0fe_GL0/go.mod) = f9e62b5491c17780d343f8de6921e04e1012858cd7ad6de24a77d38e6d941235 +SIZE (go/devel_gitaly/gitlab-org-gitaly-aee76b7fd5b7e2fd68911f2b6b5203ee7512e0fe_GL0/go.mod) = 10320 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-aee76b7fd5b7e2fd68911f2b6b5203ee7512e0fe_GL0/gitlab-org-gitaly-aee76b7fd5b7e2fd68911f2b6b5203ee7512e0fe_GL0.tar.gz) = 3e46f5ad5f82f2997395504a3233e0973adc33e2b27b9d4a6ef0944910b44ac2 +SIZE (go/devel_gitaly/gitlab-org-gitaly-aee76b7fd5b7e2fd68911f2b6b5203ee7512e0fe_GL0/gitlab-org-gitaly-aee76b7fd5b7e2fd68911f2b6b5203ee7512e0fe_GL0.tar.gz) = 3096434 diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 2fa861f82174..f9c98ceaa4eb 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-ce -PORTVERSION= 15.10.1 +PORTVERSION= 15.10.2 PORTREVISION= 0 CATEGORIES= www devel @@ -248,7 +248,7 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-countries>=4.1.3<4.2.0:devel/rubygem-countries \ rubygem-retriable>=3.1.2<3.2.0:devel/rubygem-retriable \ rubygem-lru_redux>0:devel/rubygem-lru_redux \ - rubygem-mail27>=2.7.1<2.7.2,2:mail/rubygem-mail27 \ + rubygem-mail>=2.8.1<2.8.2,2:mail/rubygem-mail \ rubygem-lockbox>=1.1.1<1.2:security/rubygem-lockbox \ rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \ rubygem-json>=2.6.3<3:devel/rubygem-json \ @@ -268,7 +268,8 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-app_store_connect>=0:net/rubygem-app_store_connect \ rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \ rubygem-net-protocol01>=0.1.3<0.2:net/rubygem-net-protocol01 \ - rubygem-duo_api>=1.3<2:security/rubygem-duo_api + rubygem-duo_api>=1.3<2:security/rubygem-duo_api \ + rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} @@ -288,7 +289,7 @@ USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT= a2b7634113a2b2f3b9aad86b1a98c52c380e5e76 +GL_COMMIT= ae06966da16860568740fd607fdf98377fcada81 USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index c44bb3c48f16..aed80ed11d48 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680516365 -SHA256 (gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0.tar.gz) = 0d1b33ffd7478861636d49d4a8f26ec08ff93d534ade6c472b36c1d13dec5cb5 -SIZE (gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0.tar.gz) = 101622772 +TIMESTAMP = 1681126489 +SHA256 (gitlab-org-gitlab-foss-ae06966da16860568740fd607fdf98377fcada81_GL0.tar.gz) = d4880ac1c3e2ddbdb94a786156a4f7c76a1895e0adc957da69beeb72f4873077 +SIZE (gitlab-org-gitlab-foss-ae06966da16860568740fd607fdf98377fcada81_GL0.tar.gz) = 101624422 diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index c22edcd4519f..82a63d5ff625 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2023-02-21 16:38:51 UTC +--- Gemfile.orig 2023-04-05 16:11:51 UTC +++ Gemfile @@ -19,7 +19,7 @@ gem 'bootsnap', '~> 1.16.0', require: false @@ -9,7 +9,7 @@ # This gem was originally bundled with Ruby 2.7, but is unbundled as of Ruby 3. # Since the latest version caused problems with GitLab, we pin this to an older # version for now. -@@ -52,23 +52,23 @@ gem 'declarative_policy', '~> 1.1.0' +@@ -49,23 +49,23 @@ gem 'declarative_policy', '~> 1.1.0' gem 'devise', '~> 4.8.1' gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' gem 'bcrypt', '~> 3.1', '>= 3.1.14' @@ -37,8 +37,8 @@ +gem 'omniauth-saml', '~> 2.0' gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md - gem 'omniauth_openid_connect', '~> 0.6.0' -@@ -78,7 +78,7 @@ gem 'openid_connect', '= 1.3.0' + gem 'omniauth_openid_connect', '~> 0.6.1' +@@ -75,7 +75,7 @@ gem 'openid_connect', '= 1.3.0' gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md gem 'omniauth-atlassian-oauth2', '~> 0.2.0' gem 'rack-oauth2', '~> 1.21.3' @@ -47,7 +47,7 @@ # Kerberos authentication. EE-only gem 'gssapi', '~> 1.3.1', group: :kerberos -@@ -162,7 +162,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.4.0', require: 'fog/a +@@ -157,7 +157,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.7.0', require: 'fog/a # for Google storage gem 'google-cloud-storage', '~> 1.44.0' @@ -56,27 +56,18 @@ gem 'google-apis-compute_v1', '~> 0.57.0' gem 'google-apis-container_v1', '~> 0.43.0' gem 'google-apis-container_v1beta1', '~> 0.43.0' -@@ -348,7 +348,7 @@ gem 'pg_query', '~> 2.2', '>= 2.2.1' - - gem 'premailer-rails', '~> 1.10.3' - --gem 'gitlab-labkit', '~> 0.30.1' -+gem 'gitlab-labkit', '~> 0.30' - gem 'thrift', '>= 0.16.0' - - # I18n -@@ -367,116 +367,20 @@ gem 'peek', '~> 1.1' +@@ -365,117 +365,20 @@ gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/ gem 'snowplow-tracker', '~> 0.8.0' # Metrics -gem 'webrick', '~> 1.6.1', require: false +gem 'webrick', '~> 1.7.0', require: false - gem 'prometheus-client-mmap', '~> 0.17', require: 'prometheus/client' + gem 'prometheus-client-mmap', '~> 0.19', require: 'prometheus/client' gem 'warning', '~> 1.3.0' -group :development do -- gem 'lefthook', '~> 1.2.9', require: false +- gem 'lefthook', '~> 1.3.3', require: false - gem 'rubocop' - gem 'solargraph', '~> 0.47.2', require: false - @@ -119,7 +110,7 @@ - gem 'bundler-audit', '~> 0.7.0.1', require: false - - # Benchmarking & profiling -- gem 'benchmark-ips', '~> 2.3.0', require: false +- gem 'benchmark-ips', '~> 2.11.0', require: false - gem 'benchmark-memory', '~> 0.1', require: false - - gem 'knapsack', '~> 1.21.1' @@ -139,7 +130,7 @@ -end - group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.7.0', require: false + gem 'gitlab-dangerfiles', '~> 3.8.0', require: false end -group :development, :test, :coverage do @@ -159,7 +150,7 @@ - gem 'rspec-retry', '~> 0.6.1' - gem 'rspec_profiling', '~> 0.0.6' - gem 'rspec-benchmark', '~> 0.6.0' -- gem 'rspec-parameterized', require: false +- gem 'rspec-parameterized', '~> 1.0', require: false - - gem 'capybara', '~> 3.35.3' - gem 'capybara-screenshot', '~> 1.0.22' diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index 16c4250ce2f9..2c4a43dcf25f 100644 --- a/www/gitlab-ce/files/patch-config_gitlab.yml.example +++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example @@ -1,6 +1,6 @@ ---- config/gitlab.yml.example.orig 2023-02-21 16:38:51 UTC +--- config/gitlab.yml.example.orig 2023-04-05 16:11:51 UTC +++ config/gitlab.yml.example -@@ -1190,14 +1190,14 @@ production: &base +@@ -1204,14 +1204,14 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -18,7 +18,7 @@ # archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600) # keep_time: 604800 # default: 0 (forever) (in seconds) # pg_schema: public # default: nil, it means that all schemas will be backed up -@@ -1232,12 +1232,12 @@ production: &base +@@ -1246,12 +1246,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -34,7 +34,7 @@ # Git over HTTP upload_pack: true -@@ -1252,13 +1252,13 @@ production: &base +@@ -1266,13 +1266,13 @@ production: &base workhorse: # File that contains the secret key for verifying access for gitlab-workhorse. # Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app). @@ -50,7 +50,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1276,13 +1276,13 @@ production: &base +@@ -1290,13 +1290,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -66,7 +66,7 @@ ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1303,18 +1303,18 @@ production: &base +@@ -1317,18 +1317,18 @@ production: &base # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq. sidekiq_exporter: @@ -92,7 +92,7 @@ # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. web_exporter: -@@ -1539,13 +1539,13 @@ test: +@@ -1553,13 +1553,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: diff --git a/www/gitlab-ce/files/patch-config_initializers_1__settings.rb b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb index 161712f1ed35..39479e99c34a 100644 --- a/www/gitlab-ce/files/patch-config_initializers_1__settings.rb +++ b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb @@ -1,6 +1,6 @@ ---- config/initializers/1_settings.rb.orig 2023-02-21 16:38:51 UTC +--- config/initializers/1_settings.rb.orig 2023-04-05 16:11:51 UTC +++ config/initializers/1_settings.rb -@@ -208,11 +208,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi +@@ -209,11 +209,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi Settings.gitlab['user'] ||= 'git' # External configuration may cause the ssh user to differ from the GitLab user Settings.gitlab['ssh_user'] ||= Settings.gitlab.user diff --git a/www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl b/www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl index 48e48daaac99..cdcc25d5e278 100644 --- a/www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl +++ b/www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl @@ -1,4 +1,4 @@ ---- lib/support/nginx/gitlab-ssl.orig 2020-11-20 12:00:55 UTC +--- lib/support/nginx/gitlab-ssl.orig 2023-04-05 16:11:51 UTC +++ lib/support/nginx/gitlab-ssl @@ -23,7 +23,7 @@ upstream gitlab-workhorse { @@ -9,7 +9,7 @@ } map $http_upgrade $connection_upgrade_gitlab_ssl { -@@ -164,7 +164,7 @@ server { +@@ -161,7 +161,7 @@ server { location ~ ^/(404|422|500|502|503)\.html$ { # Location to the GitLab's public directory, # for Omnibus this would be: /opt/gitlab/embedded/service/gitlab-rails/public diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message index b77395330926..5dd4469ccd53 100644 --- a/www/gitlab-ce/pkg-message +++ b/www/gitlab-ce/pkg-message @@ -6,7 +6,7 @@ Gitlab was installed successfully. You now need to set up the various components of Gitlab, so please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/15.9-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/15.10-freebsd.md EOM type: install } @@ -20,7 +20,7 @@ EOM If you just installed an major upgrade of GitLab, for example you switched from 14.5.x to 14.6.x, please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/15.8-15.9-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/15.9-15.10-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at: diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile index 153ef47eb908..f376fc160896 100644 --- a/www/gitlab-pages/Makefile +++ b/www/gitlab-pages/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-pages -PORTVERSION= 15.10.1 +PORTVERSION= 15.10.2 DISTVERSIONPREFIX= v PORTREVISION= 2 CATEGORIES= www @@ -19,7 +19,7 @@ GO_MODULE= gitlab.com/gitlab-org/gitlab-pages USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitlab-pages/-/tags/ -GL_COMMIT= a6f8992867871247a0b5486ecbff642a6d23ad1b +GL_COMMIT= 26ce22b38663488101dbfec70a86289de8fd0f6b GO_BUILDFLAGS= -ldflags="-X 'main.VERSION=${PORTVERSION}' -X 'main.REVISION=${GL_COMMIT}'" diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index eaba9ac25544..8cb46a6fac50 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1681107198 -SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-a6f8992867871247a0b5486ecbff642a6d23ad1b_GL0/go.mod) = 46db8658c6f0351191e106a870b9570de4ab97b900b450daa66ea74ec805f1f5 -SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-a6f8992867871247a0b5486ecbff642a6d23ad1b_GL0/go.mod) = 3020 -SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-a6f8992867871247a0b5486ecbff642a6d23ad1b_GL0/gitlab-org-gitlab-pages-a6f8992867871247a0b5486ecbff642a6d23ad1b_GL0.tar.gz) = 88f11e7b5646dd199b7f2072d2b65290f7de6cb7425c7988d200c91a21ca118e -SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-a6f8992867871247a0b5486ecbff642a6d23ad1b_GL0/gitlab-org-gitlab-pages-a6f8992867871247a0b5486ecbff642a6d23ad1b_GL0.tar.gz) = 227626 +TIMESTAMP = 1681126581 +SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-26ce22b38663488101dbfec70a86289de8fd0f6b_GL0/go.mod) = 46db8658c6f0351191e106a870b9570de4ab97b900b450daa66ea74ec805f1f5 +SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-26ce22b38663488101dbfec70a86289de8fd0f6b_GL0/go.mod) = 3020 +SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-26ce22b38663488101dbfec70a86289de8fd0f6b_GL0/gitlab-org-gitlab-pages-26ce22b38663488101dbfec70a86289de8fd0f6b_GL0.tar.gz) = 577da9906f4ac5e6ea71df0de2af88eefeb8dac9cc0e57131df7ef5e51571e97 +SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-26ce22b38663488101dbfec70a86289de8fd0f6b_GL0/gitlab-org-gitlab-pages-26ce22b38663488101dbfec70a86289de8fd0f6b_GL0.tar.gz) = 227640 diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index 3f793d2405e4..a9b5dea71a13 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-workhorse -PORTVERSION= 15.10.1 +PORTVERSION= 15.10.2 PORTREVISION= 0 DISTVERSIONPREFIX= v CATEGORIES= www @@ -25,7 +25,7 @@ USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT= a2b7634113a2b2f3b9aad86b1a98c52c380e5e76 +GL_COMMIT= ae06966da16860568740fd607fdf98377fcada81 # for go dependencies # Gitlab hosts there dependencies on their own platform and not on go-proxy diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index df1f3b82d3f4..5caaa0a54115 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1680517474 -SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0/go.mod) = 9fdf8cb254d815b1e1887360684bc8b5969b03cdaacbc9a7c8628e2828622458 -SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0/go.mod) = 6201 -SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0/gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0.tar.gz) = 0d1b33ffd7478861636d49d4a8f26ec08ff93d534ade6c472b36c1d13dec5cb5 -SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0/gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0.tar.gz) = 101622772 +TIMESTAMP = 1681126570 +SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ae06966da16860568740fd607fdf98377fcada81_GL0/go.mod) = 9fdf8cb254d815b1e1887360684bc8b5969b03cdaacbc9a7c8628e2828622458 +SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ae06966da16860568740fd607fdf98377fcada81_GL0/go.mod) = 6201 +SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ae06966da16860568740fd607fdf98377fcada81_GL0/gitlab-org-gitlab-foss-ae06966da16860568740fd607fdf98377fcada81_GL0.tar.gz) = d4880ac1c3e2ddbdb94a786156a4f7c76a1895e0adc957da69beeb72f4873077 +SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ae06966da16860568740fd607fdf98377fcada81_GL0/gitlab-org-gitlab-foss-ae06966da16860568740fd607fdf98377fcada81_GL0.tar.gz) = 101624422