Date: Wed, 5 Oct 2022 02:02:43 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 41e3f042ffe8 - main - www/gitlab-ce: Update version 15.2.5=>15.3.4 Message-ID: <202210050202.29522h39070776@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=41e3f042ffe87016d356f0d3cf61c679282a2e51 commit 41e3f042ffe87016d356f0d3cf61c679282a2e51 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2022-10-05 01:52:48 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2022-10-05 02:02:05 +0000 www/gitlab-ce: Update version 15.2.5=>15.3.4 Approved by: mfechner (By private mail) Relnotes: https://gitlab.com/gitlab-org/gitlab-foss/-/tags/v15.3.4 Sponsored by: Bounce Experts --- www/gitlab-ce/Makefile | 43 +++++---- www/gitlab-ce/distinfo | 6 +- www/gitlab-ce/files/patch-Gemfile | 104 ++++++++++++--------- www/gitlab-ce/files/patch-config_application.rb | 28 ------ ...vendor_gems_omniauth-cas3_omniauth-cas3.gemspec | 11 +++ ...or_gems_omniauth-gitlab_omniauth-gitlab.gemspec | 4 +- 6 files changed, 99 insertions(+), 97 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index ddbd36a609eb..c0aad6d00ba6 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitlab-ce -PORTVERSION= 15.2.5 -PORTREVISION= 1 +PORTVERSION= 15.3.4 +PORTREVISION= 0 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -26,15 +26,15 @@ MY_DEPENDS= git>=2.32.0:devel/git \ yarn>=1.10.0:www/yarn \ gtar>0:archivers/gtar \ bash>0:shells/bash \ - rubygem-rails61>=6.1.6.0<6.1.7:www/rubygem-rails61 \ + rubygem-rails61>=6.1.6.1<6.1.7:www/rubygem-rails61 \ rubygem-bootsnap112>=1.12.0<1.13:devel/rubygem-bootsnap112 \ rubygem-responders-rails61>=3.0<4.0:www/rubygem-responders-rails61 \ rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \ - rubygem-view_component-rails61>=2.50.0<2.51:devel/rubygem-view_component-rails61 \ + rubygem-view_component-rails61>=2.61.0<2.70:devel/rubygem-view_component-rails61 \ rubygem-default_value_for>=3.4.0<3.5.0:devel/rubygem-default_value_for \ - rubygem-pg13>=1.3.5<1.4:databases/rubygem-pg13 \ + rubygem-pg>=1.4.0<1.5:databases/rubygem-pg \ rubygem-rugged>=1.2<2:devel/rubygem-rugged \ - rubygem-grape-path-helpers>=1.7.0<1.8:devel/rubygem-grape-path-helpers \ + 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.10.0<1.11:databases/rubygem-marginalia \ rubygem-declarative_policy>=1.1.0<1.2:security/rubygem-declarative_policy \ @@ -44,7 +44,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-doorkeeper-openid_connect>=1.7.5<1.8:security/rubygem-doorkeeper-openid_connect \ rubygem-rexml>=3.2.5<3.3:textproc/rubygem-rexml \ rubygem-ruby-saml>=1.13.0<1.14:security/rubygem-ruby-saml \ - rubygem-omniauth>=2.1.0<3:security/rubygem-omniauth \ + rubygem-omniauth>=1.8.0<3:security/rubygem-omniauth \ rubygem-omniauth-auth0>=3.0.0<3.1.0:net/rubygem-omniauth-auth0 \ rubygem-omniauth-azure-activedirectory-v2>=1.0<2:net/rubygem-omniauth-azure-activedirectory-v2 \ rubygem-omniauth-azure-oauth2>=0.0.9<0.1.0:net/rubygem-omniauth-azure-oauth2 \ @@ -60,10 +60,9 @@ MY_DEPENDS= git>=2.32.0:devel/git \ 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.9.1<0.11.0:net/rubygem-gitlab-omniauth-openid-connect \ - rubygem-omniauth-ultraauth>=0.0.2<0.1.0:net/rubygem-omniauth-ultraauth \ rubygem-omniauth-salesforce>=1.0.5<1.1.0:net/rubygem-omniauth-salesforce \ rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \ - rubygem-rack-oauth2>=1.19.0<1.20.0:security/rubygem-rack-oauth2 \ + rubygem-rack-oauth2>=1.21.2<1.22.0:security/rubygem-rack-oauth2 \ rubygem-jwt>=2.1.0<3:www/rubygem-jwt \ rubygem-gssapi>0:security/rubygem-gssapi \ rubygem-recaptcha>=4.11<5.0:devel/rubygem-recaptcha \ @@ -159,7 +158,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-device_detector>=0:devel/rubygem-device_detector \ rubygem-redis4>=4.4.0<5:databases/rubygem-redis4 \ rubygem-connection_pool>=2.2.5<3.0:net/rubygem-connection_pool \ - rubygem-redis-actionpack52-rails61>=5.2.0<5.3:databases/rubygem-redis-actionpack52-rails61 \ + rubygem-redis-actionpack-rails61>=5.3.0<5.4:databases/rubygem-redis-actionpack-rails61 \ rubygem-discordrb-webhooks>=3.4<4.0:net-im/rubygem-discordrb-webhooks \ rubygem-jira-ruby21>=2.1.4<2.2:devel/rubygem-jira-ruby21 \ rubygem-atlassian-jwt>=0.2.0<0.3.0:www/rubygem-atlassian-jwt \ @@ -168,7 +167,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-hangouts-chat>=0.0.5<0.1.0:net/rubygem-hangouts-chat \ rubygem-asana0>=0.10.13<0.11:www/rubygem-asana0 \ rubygem-ruby-fogbugz021>=0.2.1<0.3.0:devel/rubygem-ruby-fogbugz021 \ - rubygem-kubeclient>=4.9.2<4.10.0:www/rubygem-kubeclient \ + rubygem-kubeclient>=4.9.3<4.10.0:www/rubygem-kubeclient \ rubygem-sanitize>=6.0<7:textproc/rubygem-sanitize \ rubygem-babosa>=1.0.4<1.1.0:textproc/rubygem-babosa \ rubygem-loofah218>=2.18.0<2.19:textproc/rubygem-loofah218 \ @@ -187,7 +186,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-gon-rails61>=6.4.0<6.5:www/rubygem-gon-rails61 \ rubygem-request_store>=1.5.1<2.0:devel/rubygem-request_store \ rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \ - rubygem-gitlab-license>=2.1.0<2.2:devel/rubygem-gitlab-license \ + rubygem-gitlab-license>=2.2.1<2.3:devel/rubygem-gitlab-license \ rubygem-rack-attack>=6.6.0<6.7:www/rubygem-rack-attack \ rubygem-sentry-raven>=3.1<4.0:devel/rubygem-sentry-raven \ rubygem-sentry-ruby>=5.1.1<5.2:devel/rubygem-sentry-ruby \ @@ -195,7 +194,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-sentry-sidekiq>=5.1.1<5.2:devel/rubygem-sentry-sidekiq \ rubygem-pg_query>=2.1.3<2.2:databases/rubygem-pg_query \ rubygem-premailer-rails-rails61>=1.10.3<1.11:mail/rubygem-premailer-rails-rails61 \ - rubygem-gitlab-labkit>=0.23.0<0.24:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.24.0<0.25:devel/rubygem-gitlab-labkit \ rubygem-thrift>=0.14.0:devel/rubygem-thrift \ rubygem-ruby_parser>=3.15<4.0:devel/rubygem-ruby_parser \ rubygem-rails-i18n-rails61>=7.0<8:devel/rubygem-rails-i18n-rails61 \ @@ -204,13 +203,13 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-gettext>=3.3<4:devel/rubygem-gettext \ rubygem-batch-loader>=2.0.1<2.1:devel/rubygem-batch-loader \ rubygem-peek-rails61>=1.1.0<2.0:devel/rubygem-peek-rails61 \ - rubygem-snowplow-tracker>=0.6.1<1:devel/rubygem-snowplow-tracker \ + rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \ rubygem-method_source>=1.0<2:devel/rubygem-method_source \ - rubygem-webrick>=1.6.1:www/rubygem-webrick \ + rubygem-webrick>=1.7.0:www/rubygem-webrick \ rubygem-prometheus-client-mmap>=0.16.0<0.17.0:devel/rubygem-prometheus-client-mmap \ rubygem-warning>=1.3.0<1.4:devel/rubygem-warning \ - rubygem-gitlab-license_finder>=6.14.2.1<7:devel/rubygem-gitlab-license_finder \ - rubygem-gitlab-dangerfiles>=3.4.3<3.5:devel/rubygem-gitlab-dangerfiles \ + rubygem-license_finder>=7.0.0<8:devel/rubygem-license_finder \ + rubygem-gitlab-dangerfiles>=3.5.0<3.6: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 \ @@ -228,14 +227,14 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-net-ntp>0:net/rubygem-net-ntp \ rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \ rubygem-spamcheck>=0.1.0<0.2:net/rubygem-spamcheck \ - rubygem-gitaly>=15.1.0.pre.rc1<15.2.0:net/rubygem-gitaly \ + rubygem-gitaly>=15.3.0.pre.rc3<15.4.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-protobuf319>=3.19.4<3.20:devel/rubygem-google-protobuf319 \ rubygem-toml-rb>=2.0.1<3:www/rubygem-toml-rb \ - rubygem-flipper021>=0.21.0<0.22:devel/rubygem-flipper021 \ - rubygem-flipper-active_record-rails61>=0.21.0<0.22:databases/rubygem-flipper-active_record-rails61 \ - rubygem-flipper-active_support_cache_store-rails61>=0.21.0<0.22:devel/rubygem-flipper-active_support_cache_store-rails61 \ + rubygem-flipper>=0.25.0<0.26:devel/rubygem-flipper \ + rubygem-flipper-active_record-rails61>=0.25.0<0.26:databases/rubygem-flipper-active_record-rails61 \ + rubygem-flipper-active_support_cache_store-rails61>=0.25.0<0.26:devel/rubygem-flipper-active_support_cache_store-rails61 \ rubygem-unleash>=3.2.2<3.3:devel/rubygem-unleash \ rubygem-gitlab-experiment>=0.7.0<0.8:devel/rubygem-gitlab-experiment \ rubygem-lograge-rails61>=0.11.2<1.0:www/rubygem-lograge-rails61 \ @@ -278,7 +277,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= e736b21380483e56b6f786480427587225feaf91 +GL_COMMIT= a347a04b6129dea62767a196124bebbf338077c9 USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index e161aa8258f5..7ea960ca4170 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664554740 -SHA256 (gitlab-org-gitlab-foss-e736b21380483e56b6f786480427587225feaf91_GL0.tar.gz) = 303e37e745bcff14bb766f888c4664e96f3b7cb3fc2e7074a142b8faae54fb7a -SIZE (gitlab-org-gitlab-foss-e736b21380483e56b6f786480427587225feaf91_GL0.tar.gz) = 101291086 +TIMESTAMP = 1664808004 +SHA256 (gitlab-org-gitlab-foss-a347a04b6129dea62767a196124bebbf338077c9_GL0.tar.gz) = 8d02a9f66fd6fb83f8fbbb52d7aec317a50fa16ea22121021a21281749943f54 +SIZE (gitlab-org-gitlab-foss-a347a04b6129dea62767a196124bebbf338077c9_GL0.tar.gz) = 100648659 diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 2e93bf1200e2..324d026c4f43 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,20 +1,25 @@ ---- Gemfile.orig 2022-08-01 14:56:36 UTC +--- Gemfile.orig 2022-09-29 08:38:14 UTC +++ Gemfile -@@ -2,7 +2,7 @@ +@@ -17,47 +17,47 @@ gem 'default_value_for', '~> 3.4.0' + gem 'default_value_for', '~> 3.4.0' - source 'https://rubygems.org' + # Supported DBs +-gem 'pg', '~> 1.4.0' ++gem 'pg', '~> 1.4' --gem 'rails', '~> 6.1.4.7' -+gem 'rails', '~> 6.1.4' + gem 'rugged', '~> 1.2' + gem 'grape-path-helpers', '~> 1.7.1' - gem 'bootsnap', '~> 1.12.0', require: false +-gem 'faraday', '~> 1.0' ++gem 'faraday', '~> 1.10.2' + gem 'marginalia', '~> 1.10.0' -@@ -29,35 +29,35 @@ gem 'marginalia', '~> 1.10.0' + # Authorization gem 'declarative_policy', '~> 1.1.0' # Authentication libraries -gem 'devise', '~> 4.7.2' -+gem 'devise', '~> 4.7' ++gem 'devise', '>= 4.7.2' gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' gem 'bcrypt', '~> 3.1', '>= 3.1.14' gem 'doorkeeper', '~> 5.5.0.rc2' @@ -23,22 +28,22 @@ gem 'ruby-saml', '~> 1.13.0' -gem 'omniauth', '~> 1.8' -gem 'omniauth-auth0', '~> 2.0.0' -+gem 'omniauth', '>= 1.8' ++gem 'omniauth', '>= 2.0' +gem 'omniauth-auth0', '~> 3.0.0' gem 'omniauth-azure-activedirectory-v2', '~> 1.0' - gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version - gem 'omniauth-cas3', '~> 1.1.4' + gem 'omniauth-azure-oauth2', '~> 0.0.9' # See vendor/gems/omniauth-azure-oauth2/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', '~> 1.0.1' -gem 'omniauth-facebook', '~> 4.0.0' -gem 'omniauth-github', '~> 1.4' -+gem 'omniauth-facebook', '>= 4.0.0' -+gem 'omniauth-github', '>= 1.4' ++gem 'omniauth-facebook', '~> 9.0.0' ++gem 'omniauth-github', '~> 2.0' gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md gem 'omniauth-google-oauth2', '~> 0.6.0' gem 'omniauth-oauth2-generic', '~> 0.2.2' -gem 'omniauth-saml', '~> 1.10' -+gem 'omniauth-saml', '~> 2.1.0' ++gem 'omniauth-saml', '~> 2.1' 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 @@ -47,80 +52,87 @@ +gem 'gitlab-omniauth-openid-connect', '~> 0.10.0', require: 'omniauth_openid_connect' gem 'omniauth-salesforce', '~> 1.0.5' gem 'omniauth-atlassian-oauth2', '~> 0.2.0' - gem 'rack-oauth2', '~> 1.19.0' + gem 'rack-oauth2', '~> 1.21.2' -gem 'jwt', '~> 2.1.0' -+gem 'jwt', '~> 2.1' ++gem 'jwt', '~> 2.5.0' # Kerberos authentication. EE-only gem 'gssapi', group: :kerberos -@@ -93,7 +93,7 @@ gem 'gpgme', '~> 2.0.19' +@@ -93,7 +93,7 @@ gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omni # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap' -gem 'net-ldap', '~> 0.16.3' -+gem 'net-ldap', '~> 0.16' ++gem 'net-ldap', '~> 0.17.1' # API gem 'grape', '~> 1.5.2' -@@ -205,10 +205,10 @@ gem 'redis-namespace', '~> 1.8.1' +@@ -205,10 +205,10 @@ gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidek gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch' # Cron Parser -gem 'fugit', '~> 1.2.1' -+gem 'fugit', '~> 1.2' ++gem 'fugit', '~> 1.7.0' # HTTP requests -gem 'httparty', '~> 0.16.4' -+gem 'httparty', '~> 0.16' ++gem 'httparty', '~> 0.20.0' # Colored output to console gem 'rainbow', '~> 3.0' -@@ -233,7 +233,7 @@ gem 'js_regex', '~> 3.7' +@@ -233,7 +233,7 @@ gem 'device_detector' gem 'device_detector' # Redis -gem 'redis', '~> 4.4.0' -+gem 'redis', '~> 4.4' ++gem 'redis', '>= 4.4.0' gem 'connection_pool', '~> 2.0' # Redis session store -@@ -335,89 +335,19 @@ gem 'batch-loader', '~> 2.0.1' +@@ -269,7 +269,7 @@ gem 'babosa', '~> 1.0.4' + gem 'babosa', '~> 1.0.4' + + # Sanitizes SVG input +-gem 'loofah', '~> 2.18.0' ++gem 'loofah', '~> 2.19.0' + + # Working with license + gem 'licensee', '~> 9.14.1' +@@ -335,118 +335,24 @@ gem 'peek', '~> 1.1' gem 'peek', '~> 1.1' # Snowplow events tracking -gem 'snowplow-tracker', '~> 0.6.1' -+gem 'snowplow-tracker', '~> 0.6' ++gem 'snowplow-tracker', '~> 0.8.0' # Metrics gem 'method_source', '~> 1.0', require: false -gem 'webrick', '~> 1.6.1', require: false -+gem 'webrick', '~> 1.6', require: false ++gem 'webrick', '~> 1.7.0', require: false gem 'prometheus-client-mmap', '~> 0.16', require: 'prometheus/client' gem 'warning', '~> 1.3.0' -group :development do -- gem 'lefthook', '~> 1.0.0', require: false +- gem 'lefthook', '~> 1.1.0', require: false - gem 'rubocop' -- gem 'solargraph', '~> 0.44.3', require: false +- gem 'solargraph', '~> 0.45.0', require: false - - gem 'letter_opener_web', '~> 2.0.0' +- gem 'lookbook' - - # Better errors handler - gem 'better_errors', '~> 2.9.0' - -- # thin instead webrick -- gem 'thin', '~> 1.8.0' -- - gem 'sprite-factory', '~> 1.7' -end - -group :development, :test do - gem 'deprecation_toolkit', '~> 1.5.1', require: false -- gem 'bullet', '~> 6.1.3' +- gem 'bullet', '~> 7.0.2' - gem 'pry-byebug' - gem 'pry-rails', '~> 0.3.9' -- gem 'pry-shell', '~> 0.5.0' +- gem 'pry-shell', '~> 0.5.1' - - gem 'awesome_print', require: false - @@ -163,7 +175,7 @@ -end - group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.4.3', require: false + gem 'gitlab-dangerfiles', '~> 3.5.0', require: false end -group :development, :test, :coverage do @@ -175,9 +187,7 @@ - # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do - # Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is -@@ -426,30 +356,6 @@ group :development, :test, :omnibus do - gem 'gitlab-license_finder', '~> 6.0', require: false + gem 'license_finder', '~> 7.0', require: false end -group :test do @@ -191,6 +201,8 @@ - gem 'capybara-screenshot', '~> 1.0.22' - gem 'selenium-webdriver', '~> 3.142' - +- gem 'graphlyte', '~> 1.0.0' +- - gem 'shoulda-matchers', '~> 5.1.0', require: false - gem 'email_spec', '~> 2.2.0' - gem 'webmock', '~> 3.9.1' @@ -207,19 +219,27 @@ gem 'octokit', '~> 4.15' # Updating this gem version here is deprecated. See: -@@ -534,7 +440,7 @@ gem 'lockbox', '~> 0.6.2' +@@ -495,7 +401,7 @@ gem 'toml-rb', '~> 2.0' + gem 'toml-rb', '~> 2.0' + + # Feature toggles +-gem 'flipper', '~> 0.25.0' ++gem 'flipper', '>= 0.25.0' + gem 'flipper-active_record', '~> 0.25.0' + gem 'flipper-active_support_cache_store', '~> 0.25.0' + gem 'unleash', '~> 3.2.2' +@@ -531,7 +437,7 @@ gem 'valid_email', '~> 0.1' gem 'valid_email', '~> 0.1' # JSON -gem 'json', '~> 2.5.1' -+gem 'json', '~> 2.5' ++gem 'json', '~> 2.6.2' gem 'json_schemer', '~> 0.2.18' - gem 'oj', '~> 3.13.19' + gem 'oj', '~> 3.13.21' gem 'multi_json', '~> 1.14.1' -@@ -554,3 +460,6 @@ gem 'ed25519', '~> 1.3.0' +@@ -551,3 +457,5 @@ gem 'error_tracking_open_api', path: 'vendor/gems/erro # 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' + +gem 'parser' -+ diff --git a/www/gitlab-ce/files/patch-config_application.rb b/www/gitlab-ce/files/patch-config_application.rb deleted file mode 100644 index f6cccb30f2dc..000000000000 --- a/www/gitlab-ce/files/patch-config_application.rb +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 diff --git a/www/gitlab-ce/files/patch-vendor_gems_omniauth-cas3_omniauth-cas3.gemspec b/www/gitlab-ce/files/patch-vendor_gems_omniauth-cas3_omniauth-cas3.gemspec new file mode 100644 index 000000000000..650ea1731c22 --- /dev/null +++ b/www/gitlab-ce/files/patch-vendor_gems_omniauth-cas3_omniauth-cas3.gemspec @@ -0,0 +1,11 @@ +--- vendor/gems/omniauth-cas3/omniauth-cas3.gemspec.orig 2022-10-04 14:28:17 UTC ++++ vendor/gems/omniauth-cas3/omniauth-cas3.gemspec +@@ -14,7 +14,7 @@ Gem::Specification.new do |gem| + gem.require_paths = ["lib"] + gem.version = Omniauth::Cas3::VERSION + +- gem.add_dependency 'omniauth', '~> 1.2', '< 3' ++ gem.add_dependency 'omniauth', '>= 1.2', '< 3' + gem.add_dependency 'nokogiri', '~> 1.7', '>= 1.7.1' + gem.add_dependency 'addressable', '~> 2.3' + diff --git a/www/gitlab-ce/files/patch-vendor_gems_omniauth-gitlab_omniauth-gitlab.gemspec b/www/gitlab-ce/files/patch-vendor_gems_omniauth-gitlab_omniauth-gitlab.gemspec index 9001645e1a55..a3a9a40cd2d5 100644 --- a/www/gitlab-ce/files/patch-vendor_gems_omniauth-gitlab_omniauth-gitlab.gemspec +++ b/www/gitlab-ce/files/patch-vendor_gems_omniauth-gitlab_omniauth-gitlab.gemspec @@ -1,4 +1,4 @@ ---- vendor/gems/omniauth-gitlab/omniauth-gitlab.gemspec.orig 2022-08-12 14:45:36 UTC +--- vendor/gems/omniauth-gitlab/omniauth-gitlab.gemspec.orig 2022-09-29 08:38:14 UTC +++ vendor/gems/omniauth-gitlab/omniauth-gitlab.gemspec @@ -16,8 +16,8 @@ Gem::Specification.new do |gem| gem.test_files = Dir['spec/**/*.rb'] @@ -6,7 +6,7 @@ - gem.add_dependency 'omniauth', '~> 1.0' - gem.add_dependency 'omniauth-oauth2', '~> 1.7.1' -+ gem.add_dependency 'omniauth', '~> 2.0' ++ gem.add_dependency 'omniauth', '~> 2.1' + gem.add_dependency 'omniauth-oauth2', '~> 1.7' gem.add_development_dependency 'rspec', '~> 3.1' gem.add_development_dependency 'rspec-its', '~> 1.0'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210050202.29522h39070776>