Date: Sat, 8 Apr 2023 18:25:16 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 324d540e38f8 - 2023Q2 - www/gitlab-ce: major upgrade to 15.9.0 Message-ID: <202304081825.338IPGBI086619@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q2 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=324d540e38f884d58cbc21458bb322e6b1390e44 commit 324d540e38f884d58cbc21458bb322e6b1390e44 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2023-03-22 07:18:27 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2023-04-08 18:24:16 +0000 www/gitlab-ce: major upgrade to 15.9.0 Changelog: https://about.gitlab.com/releases/2023/02/22/gitlab-15-9-released/ (cherry picked from commit 2ee60176b3d870ad44ec4ec664d2e2f27ddf205b) --- www/gitlab-ce/Makefile | 73 +++++++++++---------- www/gitlab-ce/distinfo | 6 +- www/gitlab-ce/files/patch-Gemfile | 75 ++++++++++------------ .../files/patch-config_database.yml.postgresql | 34 +++++----- .../files/patch-config_gitlab.yml.example | 14 ++-- .../files/patch-config_initializers_1__settings.rb | 4 +- 6 files changed, 103 insertions(+), 103 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index d30fe5a4b525..e96090057ab2 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitlab-ce -PORTVERSION= 15.8.4 -PORTREVISION= 5 +PORTVERSION= 15.9.0 +PORTREVISION= 0 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -19,21 +19,21 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # mail/rubygem-net-pop is required as ruby 3.1 removed it MY_DEPENDS= git>=2.39.2:devel/git \ gitaly>=${PORTVERSION}:devel/gitaly \ - gitlab-elasticsearch-indexer>=3.2.0:textproc/gitlab-elasticsearch-indexer \ - gitlab-agent>=15.8.0:net/gitlab-agent \ + gitlab-elasticsearch-indexer>=4.1.0:textproc/gitlab-elasticsearch-indexer \ + gitlab-agent>=15.9.0:net/gitlab-agent \ gitlab-metrics-exporter>0:devel/gitlab-metrics-exporter \ gitlab-pages>=${PORTVERSION}:www/gitlab-pages \ - gitlab-shell>=14.15.0:devel/gitlab-shell \ + gitlab-shell>=14.17.0:devel/gitlab-shell \ gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \ - redis>=6.0.14:databases/redis \ - yarn>=1.10.0:www/yarn \ + redis>=6.2.11:databases/redis \ + yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \ gtar>0:archivers/gtar \ bash>0:shells/bash \ rubygem-net-smtp>=0:mail/rubygem-net-smtp \ rubygem-net-pop>=0:mail/rubygem-net-pop \ rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \ - rubygem-rails61>=6.1.6.1<6.1.8:www/rubygem-rails61 \ - rubygem-bootsnap115>=1.15.0<1.16:devel/rubygem-bootsnap115 \ + rubygem-rails61>=6.1.7.2<6.1.8:www/rubygem-rails61 \ + rubygem-bootsnap>=1.16.0<1.17:devel/rubygem-bootsnap \ rubygem-openssl2>=2.2.2<2.3:security/rubygem-openssl2 \ rubygem-ipaddr122>=1.2.2<1.2.3:net/rubygem-ipaddr122 \ rubygem-responders-rails61>=3.0<4.0:www/rubygem-responders-rails61 \ @@ -41,7 +41,7 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-view_component-rails61>=2.74.1<2.75:devel/rubygem-view_component-rails61 \ rubygem-default_value_for>=3.4.0<3.5.0:devel/rubygem-default_value_for \ rubygem-pg>=1.4.5<1.5:databases/rubygem-pg \ - rubygem-rugged>=1.2<2:devel/rubygem-rugged \ + rubygem-rugged>=1.5<2:devel/rubygem-rugged \ rubygem-grape-path-helpers>=1.7.1<1.8:devel/rubygem-grape-path-helpers \ rubygem-faraday1>=1.10.0<2:www/rubygem-faraday1 \ rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \ @@ -57,20 +57,19 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-omniauth-azure-activedirectory-v2>=2.0<3:net/rubygem-omniauth-azure-activedirectory-v2 \ rubygem-omniauth-cas3-oauth2>=1.1.4<1.2.0:security/rubygem-omniauth-cas3-oauth2 \ rubygem-omniauth-dingtalk-oauth2>=1.0.1<2:security/rubygem-omniauth-dingtalk-oauth2 \ - rubygem-omniauth-alicloud>=2.0.0<2.1:security/rubygem-omniauth-alicloud \ + rubygem-omniauth-alicloud>=2.0.1<2.1:security/rubygem-omniauth-alicloud \ rubygem-omniauth-facebook>=4.0.0:net/rubygem-omniauth-facebook \ rubygem-omniauth-github>=2.0.1<2.1:net/rubygem-omniauth-github \ rubygem-omniauth-google-oauth2>=1.1<2:net/rubygem-omniauth-google-oauth2 \ rubygem-omniauth-oauth2-generic>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic \ rubygem-omniauth-saml>=2.0.0<3:security/rubygem-omniauth-saml \ - rubygem-omniauth-shibboleth>=1.3.0<1.4.0:security/rubygem-omniauth-shibboleth \ rubygem-omniauth-twitter>=1.4<2.0:net/rubygem-omniauth-twitter \ - rubygem-omniauth-authentiq>=0.3.3<0.4.0:net/rubygem-omniauth-authentiq \ - rubygem-gitlab-omniauth-openid-connect>=0.10.0<0.11.0:net/rubygem-gitlab-omniauth-openid-connect \ + rubygem-omniauth_openid_connect>=0.6.0<0.7.0:net/rubygem-omniauth_openid_connect \ + rubygem-openid_connect>=1.3.0<1.3.1:net/rubygem-openid_connect \ rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \ rubygem-rack-oauth21>=1.21.3<1.22.0:security/rubygem-rack-oauth21 \ rubygem-jwt25>=2.5.0<2.6:www/rubygem-jwt25 \ - rubygem-gssapi>0:security/rubygem-gssapi \ + rubygem-gssapi>=1.3.1<1.4:security/rubygem-gssapi \ rubygem-recaptcha>=5.12<6.0:devel/rubygem-recaptcha \ rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \ rubygem-invisible_captcha>=2.0.0<2.1.0:graphics/rubygem-invisible_captcha \ @@ -106,22 +105,31 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-fog-local>=0.8<1.0:net/rubygem-fog-local \ rubygem-fog-openstack>=1.0<2.0:net/rubygem-fog-openstack \ rubygem-fog-rackspace>=0.1.1<1.2.0:net/rubygem-fog-rackspace \ - rubygem-fog-aliyun>=0.3<1.0:net/rubygem-fog-aliyun \ + rubygem-fog-aliyun>=0.4<1.0:net/rubygem-fog-aliyun \ rubygem-gitlab-fog-azure-rm>=1.4.0<1.5:net/rubygem-gitlab-fog-azure-rm \ - rubygem-google-api-client>=0.33<1:devel/rubygem-google-api-client \ + rubygem-google-cloud-storage>=1.44.0<1.45:net/rubygem-google-cloud-storage \ + rubygem-google-apis-core>=0.10.0<0.12:devel/rubygem-google-apis-core \ + rubygem-google-apis-compute_v1_057>=0.57.0<0.58:devel/rubygem-google-apis-compute_v1_057 \ + rubygem-google-apis-container_v1>=0.43.0<0.44:devel/rubygem-google-apis-container_v1 \ + rubygem-google-apis-container_v1beta1>=0.43.0<0.44:devel/rubygem-google-apis-container_v1beta1 \ + rubygem-google-apis-cloudbilling_v1>=0.21.0<0.22:devel/rubygem-google-apis-cloudbilling_v1 \ + rubygem-google-apis-cloudresourcemanager_v1>=0.31.0<0.32:devel/rubygem-google-apis-cloudresourcemanager_v1 \ + rubygem-google-apis-iam_v1>=0.36.0<0.37:devel/rubygem-google-apis-iam_v1 \ + rubygem-google-apis-serviceusage_v1>=0.28.0<0.29:devel/rubygem-google-apis-serviceusage_v1 \ + rubygem-google-apis-sqladmin_v1beta4_041>=0.41.0<0.42:devel/rubygem-google-apis-sqladmin_v1beta4_041 \ rubygem-unf>=0.1.4<0.2.0:textproc/rubygem-unf \ rubygem-seed-fu>=2.3.7<2.4.0:databases/rubygem-seed-fu \ rubygem-elasticsearch-model713>=7.2<8:textproc/rubygem-elasticsearch-model713 \ rubygem-elasticsearch-rails>=7.2<8:textproc/rubygem-elasticsearch-rails \ rubygem-elasticsearch-api713>=7.13.3<7.13.4:textproc/rubygem-elasticsearch-api713 \ - rubygem-aws-sdk-core3168>=3.168.4<3.169:devel/rubygem-aws-sdk-core3168 \ + rubygem-aws-sdk-core>=3.170.0<3.171:devel/rubygem-aws-sdk-core \ rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \ - rubygem-aws-sdk-s31117>=1.117.2<1.118:devel/rubygem-aws-sdk-s31117 \ + rubygem-aws-sdk-s3>=1.119.1<1.120:devel/rubygem-aws-sdk-s3 \ rubygem-faraday_middleware-aws-sigv403>=0.3.0<0.4:devel/rubygem-faraday_middleware-aws-sigv403 \ rubygem-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \ rubygem-html-pipeline>=2.14.3<2.15:textproc/rubygem-html-pipeline \ rubygem-deckar01-task_list>=2.3.2<2.4:www/rubygem-deckar01-task_list \ - rubygem-gitlab-markup>=1.8.0<1.9.0:textproc/rubygem-gitlab-markup \ + rubygem-gitlab-markup>=1.9.0<1.10.0:textproc/rubygem-gitlab-markup \ rubygem-commonmarker>=0.23.6<0.24:textproc/rubygem-commonmarker \ rubygem-kramdown23>=2.3.1<2.4:textproc/rubygem-kramdown23 \ rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \ @@ -135,8 +143,7 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-asciidoctor-kroki>=0.7.0<0.8:textproc/rubygem-asciidoctor-kroki \ rubygem-rouge>=3.30.0<3.31:textproc/rubygem-rouge \ rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \ - rubygem-bootstrap_form>=4.2.0<4.3.0:devel/rubygem-bootstrap_form \ - rubygem-nokogiri>=1.13.10<1.14:textproc/rubygem-nokogiri \ + rubygem-nokogiri>=1.14.1<1.15:textproc/rubygem-nokogiri \ rubygem-icalendar>=0:devel/rubygem-icalendar \ rubygem-diffy>=3.4<4:textproc/rubygem-diffy \ rubygem-diff_match_patch>=0.1.0<0.2.0:textproc/rubygem-diff_match_patch \ @@ -151,7 +158,7 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-sidekiq-cron18>=1.8.0<1.9:devel/rubygem-sidekiq-cron18 \ rubygem-redis-namespace19>=1.9.0<1.10.0:databases/rubygem-redis-namespace19 \ rubygem-gitlab-sidekiq-fetcher>=0.9.0<0.10:devel/rubygem-gitlab-sidekiq-fetcher \ - rubygem-fugit17>=1.7.0<1.8:devel/rubygem-fugit17 \ + rubygem-fugit>=1.8.1<1.9:devel/rubygem-fugit \ rubygem-httparty>=0.20.0<0.21:www/rubygem-httparty \ rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \ rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \ @@ -194,11 +201,11 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-sentry-ruby>=5.1.1<5.2:devel/rubygem-sentry-ruby \ rubygem-sentry-rails>=5.1.1<5.2:devel/rubygem-sentry-rails \ rubygem-sentry-sidekiq>=5.1.1<5.2:devel/rubygem-sentry-sidekiq \ - rubygem-pg_query>=2.2<3:databases/rubygem-pg_query \ + rubygem-pg_query>=2.2.1<3:databases/rubygem-pg_query \ rubygem-premailer-rails-rails61>=1.10.3<1.11:mail/rubygem-premailer-rails-rails61 \ - rubygem-gitlab-labkit>=0.29.0<0.30:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.31.0<0.32:devel/rubygem-gitlab-labkit \ rubygem-thrift>=0.16.0:devel/rubygem-thrift \ - rubygem-ruby_parser>=3.15<4.0:devel/rubygem-ruby_parser \ + rubygem-ruby_parser>=3.19<4.0:devel/rubygem-ruby_parser \ rubygem-rails-i18n-rails61>=7.0<8:devel/rubygem-rails-i18n-rails61 \ rubygem-gettext_i18n_rails18>=1.8.0<1.9.0:devel/rubygem-gettext_i18n_rails18 \ rubygem-gettext_i18n_rails_js-rails61>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails61 \ @@ -210,7 +217,7 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-prometheus-client-mmap>=0.17<1:devel/rubygem-prometheus-client-mmap \ rubygem-warning>=1.3.0<1.4:devel/rubygem-warning \ rubygem-license_finder>=7.0.0<8:devel/rubygem-license_finder \ - rubygem-gitlab-dangerfiles>=3.6.4<3.7:devel/rubygem-gitlab-dangerfiles \ + rubygem-gitlab-dangerfiles>=3.7.0<3.8:devel/rubygem-gitlab-dangerfiles \ rubygem-octokit>=4.20<5.0:net/rubygem-octokit \ rubygem-gitlab-mail_room>=0.0.9<0.1.0:mail/rubygem-gitlab-mail_room \ rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \ @@ -227,7 +234,7 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-net-ntp>0:net/rubygem-net-ntp \ rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \ rubygem-spamcheck>=1.0.0<1.1:net/rubygem-spamcheck \ - rubygem-gitaly>=15.5.2<15.6.0:net/rubygem-gitaly \ + rubygem-gitaly>=15.9.0.pre.rc3<15.10.0:net/rubygem-gitaly \ rubygem-kas-grpc>=0.0.2,1<0.0.3,1:net/rubygem-kas-grpc \ rubygem-grpc142>=1.42.0<1.43:net/rubygem-grpc142 \ rubygem-google-protobuf>=3.21.12<4:devel/rubygem-google-protobuf \ @@ -246,7 +253,7 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-mail27>=2.7.1<2.7.2,2:mail/rubygem-mail27 \ rubygem-lockbox>=1.1.1<1.2:security/rubygem-lockbox \ rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \ - rubygem-json>=2.5.1<3:devel/rubygem-json \ + rubygem-json>=2.6.3<3:devel/rubygem-json \ rubygem-json_schemer>=0.2.18<0.3:devel/rubygem-json_schemer \ rubygem-oj>=3.13.21<3.14:devel/rubygem-oj \ rubygem-oj-introspect>=0.7<1:devel/rubygem-oj-introspect \ @@ -275,14 +282,14 @@ CONFLICTS_INSTALL= gitolite \ gitea \ gitosis -USES= go:modules ruby shebangfix +USES= go:modules nodejs:env ruby shebangfix USE_RC_SUBR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT= 54f2a13176e4d174500a39302d29895d7e729d38 +GL_COMMIT= c757b8d6946b7223e350edc0ea24db7b1ba25087 USERS= git GROUPS= git @@ -304,7 +311,9 @@ SHEBANG_FILES= scripts/build_qa_image \ scripts/generate-e2e-pipeline \ scripts/frontend/execute-on-staged-files.sh \ scripts/frontend/start_storybook.sh \ + scripts/partitioning/generate-fk \ .lefthook/pre-push/merge_conflicts \ + qa/gdk/launch \ qa/bin/test post-patch: @@ -315,8 +324,6 @@ post-patch: # Remove symlink a create a file with content ${RM} ${WRKSRC}/GITLAB_WORKHORSE_VERSION ${ECHO} ${PORTVERSION} > ${WRKSRC}/GITLAB_WORKHORSE_VERSION - # Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/389843 - ${MV} ${WRKSRC}/spec/features/projects/pipelines/legacy_pipelines_spec.rb\ ${WRKSRC}/spec/features/projects/pipelines/legacy_pipelines_spec.rb do-install: ${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 00c2e0c95d0f..c2ce8b64d420 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1677873438 -SHA256 (gitlab-org-gitlab-foss-54f2a13176e4d174500a39302d29895d7e729d38_GL0.tar.gz) = 5cef76fb50d9aa4b6ed9ffad44b7346fc50b8b8ba7cafc80fb70d837981bbd07 -SIZE (gitlab-org-gitlab-foss-54f2a13176e4d174500a39302d29895d7e729d38_GL0.tar.gz) = 99767300 +TIMESTAMP = 1677093796 +SHA256 (gitlab-org-gitlab-foss-c757b8d6946b7223e350edc0ea24db7b1ba25087_GL0.tar.gz) = 03d334a452476e79fb0b7bfa6958c0e751503521ac2c3912e409175b66a5f6ce +SIZE (gitlab-org-gitlab-foss-c757b8d6946b7223e350edc0ea24db7b1ba25087_GL0.tar.gz) = 101380292 diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 5c24857db75d..6a8d283bc92f 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,13 +1,6 @@ ---- Gemfile.orig 2023-03-02 09:53:28 UTC +--- Gemfile.orig 2023-02-21 16:38:51 UTC +++ Gemfile -@@ -13,13 +13,13 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems - # NOTE: When incrementing the major or minor version here, also increment activerecord_version - # in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve - # https://gitlab.com/gitlab-org/gitlab/-/issues/375713 --gem 'rails', '~> 6.1.6.1' -+gem 'rails', '~> 6.1.6' - - gem 'bootsnap', '~> 1.15.0', require: false +@@ -19,7 +19,7 @@ gem 'bootsnap', '~> 1.16.0', require: false # Pin openssl to match the version bundled with our supported Rubies. # See https://stdgems.org/openssl/#gem-version. @@ -32,7 +25,7 @@ gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md gem 'omniauth-cas3', '~> 1.1.4', path: 'vendor/gems/omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md gem 'omniauth-dingtalk-oauth2', '~> 1.0' - gem 'omniauth-alicloud', '~> 2.0.0' + gem 'omniauth-alicloud', '~> 2.0.1' -gem 'omniauth-facebook', '~> 4.0.0' -gem 'omniauth-github', '2.0.1' +gem 'omniauth-facebook', '>= 4.0.0' @@ -42,10 +35,10 @@ gem 'omniauth-oauth2-generic', '~> 0.2.2' -gem 'omniauth-saml', '~> 2.0.0' +gem 'omniauth-saml', '~> 2.0' - gem 'omniauth-shibboleth', '~> 1.3.0' gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md -@@ -77,7 +77,7 @@ gem 'gitlab-omniauth-openid-connect', '~> 0.10.0', req + gem 'omniauth_openid_connect', '~> 0.6.0' +@@ -78,7 +78,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' @@ -53,17 +46,26 @@ +gem 'jwt', '~> 2.5.0' # Kerberos authentication. EE-only - gem 'gssapi', group: :kerberos -@@ -223,7 +223,7 @@ gem 'redis-namespace', '~> 1.9.0' - gem 'gitlab-sidekiq-fetcher', '0.9.0', require: 'sidekiq-reliable-fetch' - - # Cron Parser --gem 'fugit', '~> 1.2.1' -+gem 'fugit', '~> 1.7.0' - - # HTTP requests - gem 'httparty', '~> 0.20.0' -@@ -352,116 +352,20 @@ gem 'peek', '~> 1.1' + gem 'gssapi', '~> 1.3.1', group: :kerberos +@@ -162,7 +162,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.4.0', require: 'fog/a + + # for Google storage + gem 'google-cloud-storage', '~> 1.44.0' +-gem 'google-apis-core', '~> 0.10.0' ++gem 'google-apis-core', '~> 0.10' + 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' gem 'snowplow-tracker', '~> 0.8.0' # Metrics @@ -74,12 +76,12 @@ gem 'warning', '~> 1.3.0' -group :development do -- gem 'lefthook', '~> 1.2.7', require: false +- gem 'lefthook', '~> 1.2.9', require: false - gem 'rubocop' - gem 'solargraph', '~> 0.47.2', require: false - - gem 'letter_opener_web', '~> 2.0.0' -- gem 'lookbook', '~> 1.4', '>= 1.4.5' +- gem 'lookbook', '~> 1.5', '>= 1.5.3' - - # Better errors handler - gem 'better_errors', '~> 2.9.1' @@ -94,13 +96,13 @@ - gem 'bullet', '~> 7.0.2' - gem 'pry-byebug' - gem 'pry-rails', '~> 0.3.9' -- gem 'pry-shell', '~> 0.5.1' +- gem 'pry-shell', '~> 0.6.1' - - gem 'awesome_print', require: false - - gem 'database_cleaner', '~> 1.7.0' - gem 'factory_bot_rails', '~> 6.2.0' -- gem 'rspec-rails', '~> 5.0.1' +- gem 'rspec-rails', '~> 6.0.1' - - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.11.0' @@ -111,7 +113,7 @@ - gem 'spring', '~> 4.1.0' - gem 'spring-commands-rspec', '~> 1.0.4' - -- gem 'gitlab-styles', '~> 9.2.0', require: false +- gem 'gitlab-styles', '~> 10.0.0', require: false - - gem 'haml_lint', '~> 0.40.0', require: false - gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -137,7 +139,7 @@ -end - group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.6.4', require: false + gem 'gitlab-dangerfiles', '~> 3.7.0', require: false end -group :development, :test, :coverage do @@ -181,7 +183,7 @@ gem 'octokit', '~> 4.15' # Updating this gem version here is deprecated. See: -@@ -508,7 +412,7 @@ gem 'google-protobuf', '~> 3.21', '>= 3.21.12' +@@ -523,7 +427,7 @@ gem 'google-protobuf', '~> 3.21', '>= 3.21.12' gem 'toml-rb', '~> 2.2.0' # Feature toggles @@ -190,7 +192,7 @@ gem 'flipper-active_record', '~> 0.25.0' gem 'flipper-active_support_cache_store', '~> 0.25.0' gem 'unleash', '~> 3.2.2' -@@ -522,7 +426,7 @@ gem 'grape_logging', '~> 1.8' +@@ -537,7 +441,7 @@ gem 'grape_logging', '~> 1.8' gem 'gitlab-net-dns', '~> 0.9.1' # Countries list @@ -199,16 +201,7 @@ gem 'retriable', '~> 3.1.2' -@@ -544,7 +448,7 @@ gem 'lockbox', '~> 1.1.1' - gem 'valid_email', '~> 0.1' - - # JSON --gem 'json', '~> 2.5.1' -+gem 'json', '~> 2.6.2' - gem 'json_schemer', '~> 0.2.18' - gem 'oj', '~> 3.13.21' - gem 'oj-introspect', '~> 0.7' -@@ -565,6 +469,11 @@ gem 'ed25519', '~> 1.3.0' +@@ -580,6 +484,11 @@ gem 'ed25519', '~> 1.3.0' # Error Tracking OpenAPI client # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature gem 'error_tracking_open_api', path: 'vendor/gems/error_tracking_open_api' diff --git a/www/gitlab-ce/files/patch-config_database.yml.postgresql b/www/gitlab-ce/files/patch-config_database.yml.postgresql index 0171f74c45b2..25d933f3d56c 100644 --- a/www/gitlab-ce/files/patch-config_database.yml.postgresql +++ b/www/gitlab-ce/files/patch-config_database.yml.postgresql @@ -1,9 +1,9 @@ ---- config/database.yml.postgresql.orig 2022-07-01 16:12:26 UTC +--- config/database.yml.postgresql.orig 2023-02-21 16:38:51 UTC +++ config/database.yml.postgresql -@@ -18,13 +18,6 @@ production: - # port: 8600 - # record: secondary.postgresql.service.consul - # interval: 300 +@@ -26,13 +26,6 @@ production: + # username: git + # password: "secure password" + # host: localhost - geo: - adapter: postgresql - encoding: unicode @@ -14,10 +14,10 @@ # # Development specific -@@ -39,13 +32,6 @@ development: - host: localhost - variables: - statement_timeout: 15s +@@ -57,13 +50,6 @@ development: + # host: localhost + # variables: + # statement_timeout: 15s - geo: - adapter: postgresql - encoding: unicode @@ -28,10 +28,10 @@ # # Staging specific -@@ -58,13 +44,6 @@ staging: - username: git - password: "secure password" - host: localhost +@@ -84,13 +70,6 @@ staging: + # username: git + # password: "secure password" + # host: localhost - geo: - adapter: postgresql - encoding: unicode @@ -42,10 +42,10 @@ # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". -@@ -80,10 +59,3 @@ test: &test - prepared_statements: false - variables: - statement_timeout: 15s +@@ -117,10 +96,3 @@ test: &test + # prepared_statements: false + # variables: + # statement_timeout: 15s - geo: - adapter: postgresql - encoding: unicode diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index 10531ba84daa..16c4250ce2f9 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-01-20 09:57:01 UTC +--- config/gitlab.yml.example.orig 2023-02-21 16:38:51 UTC +++ config/gitlab.yml.example -@@ -1192,14 +1192,14 @@ production: &base +@@ -1190,14 +1190,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 -@@ -1234,12 +1234,12 @@ production: &base +@@ -1232,12 +1232,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -34,7 +34,7 @@ # Git over HTTP upload_pack: true -@@ -1254,13 +1254,13 @@ production: &base +@@ -1252,13 +1252,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 -@@ -1278,13 +1278,13 @@ production: &base +@@ -1276,13 +1276,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 -@@ -1305,18 +1305,18 @@ production: &base +@@ -1303,18 +1303,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: -@@ -1541,13 +1541,13 @@ test: +@@ -1539,13 +1539,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 b08117571cdf..161712f1ed35 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 2022-11-11 19:24:20 UTC +--- config/initializers/1_settings.rb.orig 2023-02-21 16:38:51 UTC +++ config/initializers/1_settings.rb -@@ -207,11 +207,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi +@@ -208,11 +208,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304081825.338IPGBI086619>