diff options
| -rw-r--r-- | www/gitlab-ce/Makefile | 80 | ||||
| -rw-r--r-- | www/gitlab-ce/distinfo | 6 | ||||
| -rw-r--r-- | www/gitlab-ce/files/patch-Gemfile | 57 | ||||
| -rw-r--r-- | www/gitlab-ce/files/patch-config_initializers_google__api__client__patch.rb | 11 | ||||
| -rw-r--r-- | www/gitlab-ce/files/patch-config_puma.rb.example | 4 | ||||
| -rw-r--r-- | www/gitlab-ce/pkg-message | 4 |
6 files changed, 63 insertions, 99 deletions
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index b722a1f087ae..6668e648eb29 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitlab-ce -PORTVERSION= 15.5.6 -PORTREVISION= 4 +PORTVERSION= 15.6.0 +PORTREVISION= 0 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -14,13 +14,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # which makes maintaining this long list much easier! # devel/rubygem-parser is required for database upgrade process # see https://gitlab.com/gitlab-org/gitlab/-/issues/350866 -MY_DEPENDS= git>=2.32.0:devel/git \ +MY_DEPENDS= git>=2.37.0:devel/git \ gitaly>=${PORTVERSION}:devel/gitaly \ - gitlab-elasticsearch-indexer>=3.0.3:textproc/gitlab-elasticsearch-indexer \ - gitlab-agent>=15.5.1:net/gitlab-agent \ + gitlab-elasticsearch-indexer>=3.1.0:textproc/gitlab-elasticsearch-indexer \ + gitlab-agent>=15.6.0:net/gitlab-agent \ gitlab-metrics-exporter>0:devel/gitlab-metrics-exporter \ - gitlab-pages>=1.61.0:www/gitlab-pages \ - gitlab-shell>=14.12.0:devel/gitlab-shell \ + gitlab-pages>=1.63.0:www/gitlab-pages \ + gitlab-shell>=14.13.0:devel/gitlab-shell \ gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \ redis>=6.0.14:databases/redis \ yarn>=1.10.0:www/yarn \ @@ -32,7 +32,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-ipaddr122>=1.2.2<1.2.3:net/rubygem-ipaddr122 \ 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.71.0<2.72:devel/rubygem-view_component-rails61 \ + 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.3<1.5:databases/rubygem-pg \ rubygem-rugged>=1.2<2:devel/rubygem-rugged \ @@ -67,14 +67,14 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-gssapi>0:security/rubygem-gssapi \ rubygem-recaptcha>=4.11<5.0:devel/rubygem-recaptcha \ rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \ - rubygem-invisible_captcha>=1.1.0<1.2.0:graphics/rubygem-invisible_captcha \ + rubygem-invisible_captcha>=2.0.0<2.1.0:graphics/rubygem-invisible_captcha \ rubygem-devise-two-factor-rails61>=4.0.2<4.1:security/rubygem-devise-two-factor-rails61 \ rubygem-rqrcode-rails3>=0.1.7<0.2.0:www/rubygem-rqrcode-rails3 \ rubygem-u2f0>=0.2.1<0.3.0:net/rubygem-u2f0 \ rubygem-validates_hostname>=1.0.11<1.1.0:dns/rubygem-validates_hostname \ rubygem-rubyzip>=2.3.2<2.4:archivers/rubygem-rubyzip \ rubygem-acme-client>=2.0.9<3:security/rubygem-acme-client \ - rubygem-browser>=4.2<5.0:www/rubygem-browser \ + rubygem-browser>=5.3.1<5.4:www/rubygem-browser \ rubygem-ohai>=16.10<17:sysutils/rubygem-ohai \ rubygem-gpgme>=2.0.20<2.1.0:security/rubygem-gpgme \ rubygem-gitlab_omniauth-ldap>=2.2.0<2.3.0:net/rubygem-gitlab_omniauth-ldap \ @@ -89,35 +89,33 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-apollo_upload_server>=2.1.0<2.2:net/rubygem-apollo_upload_server \ rubygem-graphql-docs>=2.1.0<2.2.0:devel/rubygem-graphql-docs \ rubygem-graphlient>=0.5.0<0.6:devel/rubygem-graphlient \ - rubygem-hashie>=4.1.0:devel/rubygem-hashie \ - rubygem-hashie-forbidden_attributes>0:devel/rubygem-hashie-forbidden_attributes \ - rubygem-kaminari-rails61>=1.2.1<2.0:www/rubygem-kaminari-rails61 \ + rubygem-hashie>=5.0.0<5.1:devel/rubygem-hashie \ + rubygem-kaminari-rails61>=1.2.2<1.3:www/rubygem-kaminari-rails61 \ rubygem-hamlit>=2.15.0<2.16:www/rubygem-hamlit \ rubygem-carrierwave>=1.3.2<2.0:www/rubygem-carrierwave \ rubygem-mini_magick410>=4.10.1<4.11:graphics/rubygem-mini_magick410 \ - rubygem-fog-aws>=3.14<4:net/rubygem-fog-aws \ + rubygem-fog-aws>=3.15<4:net/rubygem-fog-aws \ rubygem-fog-core210>=2.1.0<2.1.1:devel/rubygem-fog-core210 \ - rubygem-fog-google>=1.15<2:net/rubygem-fog-google \ - rubygem-fog-local>=0.6<1.0:net/rubygem-fog-local \ + rubygem-fog-google>=1.19<2:net/rubygem-fog-google \ + 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-gitlab-fog-azure-rm>=1.3.0<1.4:net/rubygem-gitlab-fog-azure-rm \ + 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-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-core>=3.159.0<3.169:devel/rubygem-aws-sdk-core \ + rubygem-aws-sdk-core>=3.167.0<3.169:devel/rubygem-aws-sdk-core \ rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \ - rubygem-aws-sdk-s3>=1.114.0<1.118:devel/rubygem-aws-sdk-s3 \ + rubygem-aws-sdk-s3>=1.117.1<1.118: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.13.2<2.14:textproc/rubygem-html-pipeline \ - rubygem-deckar01-task_list=2.3.1:www/rubygem-deckar01-task_list \ + 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-github-markup17>=1.7.0<1.8.0:textproc/rubygem-github-markup17 \ 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 \ @@ -128,11 +126,11 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-asciidoctor>=2.0.17<2.1.0:textproc/rubygem-asciidoctor \ rubygem-asciidoctor-include-ext>=0.4.0<0.5.0:textproc/rubygem-asciidoctor-include-ext \ rubygem-asciidoctor-plantuml00>=0.0.16<0.1:textproc/rubygem-asciidoctor-plantuml00 \ - rubygem-asciidoctor-kroki>=0.5.0<0.6:textproc/rubygem-asciidoctor-kroki \ - rubygem-rouge329>=3.29.0<3.30:textproc/rubygem-rouge329 \ + 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.8<1.14:textproc/rubygem-nokogiri \ + rubygem-nokogiri>=1.13.9<1.14: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 \ @@ -143,20 +141,20 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-sd_notify>=0.1.0<0.2:devel/rubygem-sd_notify \ rubygem-state_machines-activerecord>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord \ rubygem-acts-as-taggable-on>=9.0<10:www/rubygem-acts-as-taggable-on \ - rubygem-sidekiq64>=6.4.0<6.5:devel/rubygem-sidekiq64 \ - rubygem-sidekiq-cron-sidekiq64>=1.8.0<1.9:devel/rubygem-sidekiq-cron-sidekiq64 \ + rubygem-sidekiq>=6.5.7<6.6:devel/rubygem-sidekiq \ + rubygem-sidekiq-cron>=1.8.0<1.9:devel/rubygem-sidekiq-cron \ rubygem-redis-namespace>=1.9.0<1.10.0:databases/rubygem-redis-namespace \ - rubygem-gitlab-sidekiq-fetcher>=0.8.0<0.9:devel/rubygem-gitlab-sidekiq-fetcher \ + rubygem-gitlab-sidekiq-fetcher>=0.9.0<0.10:devel/rubygem-gitlab-sidekiq-fetcher \ rubygem-fugit>=1.2.1<2:devel/rubygem-fugit \ - rubygem-httparty>=0.16.4<1:www/rubygem-httparty \ + 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 \ rubygem-settingslogic>=2.0.9<2.1.0:devel/rubygem-settingslogic \ - rubygem-re2>=1.5.0<1.6.0:devel/rubygem-re2 \ + rubygem-re2>=1.6.0<1.7.0:devel/rubygem-re2 \ rubygem-version_sorter>=2.2.4<2.3.0:textproc/rubygem-version_sorter \ - rubygem-js_regex>=3.7<4.0:textproc/rubygem-js_regex \ + rubygem-js_regex>=3.8<4.0:textproc/rubygem-js_regex \ rubygem-device_detector>=0:devel/rubygem-device_detector \ - rubygem-redis4>=4.7.0<5:databases/rubygem-redis4 \ + rubygem-redis4>=4.8.0<5:databases/rubygem-redis4 \ rubygem-connection_pool>=2.2.5<3.0:net/rubygem-connection_pool \ 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 \ @@ -166,7 +164,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-slack-messenger>=2.3.4<2.4.0:devel/rubygem-slack-messenger \ 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-ruby-fogbugz>=0.3.0<0.4.0:devel/rubygem-ruby-fogbugz \ 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 \ @@ -192,9 +190,9 @@ MY_DEPENDS= git>=2.32.0: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.1.4<2.2:databases/rubygem-pg_query \ + rubygem-pg_query>=2.2<3:databases/rubygem-pg_query \ rubygem-premailer-rails-rails61>=1.10.3<1.11:mail/rubygem-premailer-rails-rails61 \ - rubygem-gitlab-labkit>=0.24.0<0.29:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.28.0<0.29:devel/rubygem-gitlab-labkit \ rubygem-thrift>=0.16.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 \ @@ -208,14 +206,14 @@ MY_DEPENDS= git>=2.32.0:devel/git \ 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-license_finder>=7.0.0<8:devel/rubygem-license_finder \ - rubygem-gitlab-dangerfiles>=3.5.2<3.6:devel/rubygem-gitlab-dangerfiles \ + rubygem-gitlab-dangerfiles>=3.6.2<3.7: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 \ rubygem-html2text>=0:textproc/rubygem-html2text \ rubygem-stackprof>=0.2.21<0.3:devel/rubygem-stackprof \ rubygem-rbtrace>=0.4.14<1.0:devel/rubygem-rbtrace \ - rubygem-memory_profiler>=0.9<1.0:devel/rubygem-memory_profiler \ + rubygem-memory_profiler>=1.0<2.0:devel/rubygem-memory_profiler \ rubygem-benchmark-memory>=0.1<1.0:benchmarks/rubygem-benchmark-memory \ rubygem-activerecord-explain-analyze>=0.1<1.0:databases/rubygem-activerecord-explain-analyze \ rubygem-oauth2>=2.0<3:net/rubygem-oauth2 \ @@ -228,7 +226,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-gitaly>=15.5.2<15.6.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.0<4:devel/rubygem-google-protobuf \ + rubygem-google-protobuf>=3.21.9<4:devel/rubygem-google-protobuf \ rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \ 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 \ @@ -247,6 +245,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-json>=2.5.1<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 \ rubygem-multi_json114>=1.14.1<1.15:devel/rubygem-multi_json114 \ rubygem-yajl-ruby>=1.4.3<1.5:devel/rubygem-yajl-ruby \ rubygem-webauthn>=2.3<3:security/rubygem-webauthn \ @@ -256,7 +255,8 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-parser>=0:devel/rubygem-parser \ rubygem-cvss-suite>=3.0.1<3.1:security/rubygem-cvss-suite \ rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \ - rubygem-CFPropertyList>=0:devel/rubygem-CFPropertyList + rubygem-CFPropertyList>=0:devel/rubygem-CFPropertyList \ + rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} @@ -277,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= a2f39fb243f2ad2ba59939e2e6446ec9b19911f2 +GL_COMMIT= 7f1a7c62df90aa19155a623b4e6cae73c5d5fc0b USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 63138071ae6a..03d97c9d7ee7 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1670479180 -SHA256 (gitlab-org-gitlab-foss-a2f39fb243f2ad2ba59939e2e6446ec9b19911f2_GL0.tar.gz) = 41ed73b637f139dec0e6d337f9e230cd3c20d50f6c7b34ddcf6078d9219d56cb -SIZE (gitlab-org-gitlab-foss-a2f39fb243f2ad2ba59939e2e6446ec9b19911f2_GL0.tar.gz) = 97978338 +TIMESTAMP = 1669453495 +SHA256 (gitlab-org-gitlab-foss-7f1a7c62df90aa19155a623b4e6cae73c5d5fc0b_GL0.tar.gz) = 7723ea178284503fec3771102a3c08c33728ca669cea0fa299ef5fa292df7b9c +SIZE (gitlab-org-gitlab-foss-7f1a7c62df90aa19155a623b4e6cae73c5d5fc0b_GL0.tar.gz) = 98454507 diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 85b35e8e80a5..f40936dd9044 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2022-12-07 19:22:40 UTC +--- Gemfile.orig 2022-11-21 09:46:38 UTC +++ Gemfile @@ -13,9 +13,9 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems # NOTE: When incrementing the major or minor version here, also increment activerecord_version @@ -53,50 +53,25 @@ # API gem 'grape', '~> 1.5.2' -@@ -168,9 +168,9 @@ gem 'seed-fu', '~> 2.3.7' +@@ -166,7 +166,7 @@ gem 'seed-fu', '~> 2.3.7' gem 'elasticsearch-model', '~> 7.2' gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-api', '7.13.3' --gem 'aws-sdk-core', '~> 3.159.0' -+gem 'aws-sdk-core', '~> 3.159' +-gem 'aws-sdk-core', '~> 3.167.0' ++gem 'aws-sdk-core', '~> 3.167' gem 'aws-sdk-cloudformation', '~> 1' --gem 'aws-sdk-s3', '~> 1.114.0' -+gem 'aws-sdk-s3', '~> 1.114' + gem 'aws-sdk-s3', '~> 1.117.1' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' - gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections - -@@ -226,10 +226,10 @@ gem 'redis-namespace', '~> 1.9.0' - gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch' +@@ -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.16.4' -+gem 'httparty', '~> 0.20.0' - - # Colored output to console - gem 'rainbow', '~> 3.0' -@@ -254,7 +254,7 @@ gem 'js_regex', '~> 3.7' - gem 'device_detector' - - # Redis --gem 'redis', '~> 4.7.0' -+gem 'redis', '~> 4.8.0' - gem 'connection_pool', '~> 2.0' - - # Redis session store -@@ -340,7 +340,7 @@ gem 'pg_query', '~> 2.1.4' - gem 'premailer-rails', '~> 1.10.3' - - # LabKit: Tracing and Correlation --gem 'gitlab-labkit', '~> 0.24.0' -+gem 'gitlab-labkit', '~> 0.24' - gem 'thrift', '>= 0.16.0' - - # I18n -@@ -356,119 +356,23 @@ gem 'batch-loader', '~> 2.0.1' + gem 'httparty', '~> 0.20.0' +@@ -353,119 +353,23 @@ gem 'batch-loader', '~> 2.0.1' gem 'peek', '~> 1.1' # Snowplow events tracking @@ -111,12 +86,12 @@ gem 'warning', '~> 1.3.0' -group :development do -- gem 'lefthook', '~> 1.1.3', require: false +- gem 'lefthook', '~> 1.2.0', require: false - gem 'rubocop' - gem 'solargraph', '~> 0.47.2', require: false - - gem 'letter_opener_web', '~> 2.0.0' -- gem 'lookbook', '~> 1.0', '>= 1.0.8' +- gem 'lookbook', '~> 1.2', '>= 1.2.1' - - # Better errors handler - gem 'better_errors', '~> 2.9.1' @@ -174,7 +149,7 @@ -end - group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.5.2', require: false + gem 'gitlab-dangerfiles', '~> 3.6.2', require: false end -group :development, :test, :coverage do @@ -218,7 +193,7 @@ gem 'octokit', '~> 4.15' # Updating this gem version here is deprecated. See: -@@ -515,7 +419,7 @@ gem 'google-protobuf', '~> 3.21' +@@ -512,7 +416,7 @@ gem 'google-protobuf', '~> 3.21', '>= 3.21.9' gem 'toml-rb', '~> 2.2.0' # Feature toggles @@ -227,7 +202,7 @@ gem 'flipper-active_record', '~> 0.25.0' gem 'flipper-active_support_cache_store', '~> 0.25.0' gem 'unleash', '~> 3.2.2' -@@ -551,7 +455,7 @@ gem 'lockbox', '~> 0.6.2' +@@ -548,7 +452,7 @@ gem 'lockbox', '~> 0.6.2' gem 'valid_email', '~> 0.1' # JSON @@ -235,8 +210,8 @@ +gem 'json', '~> 2.6.2' gem 'json_schemer', '~> 0.2.18' gem 'oj', '~> 3.13.21' - gem 'multi_json', '~> 1.14.1' -@@ -571,6 +475,8 @@ gem 'ed25519', '~> 1.3.0' + gem 'oj-introspect', '~> 0.7' +@@ -569,6 +473,8 @@ 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_initializers_google__api__client__patch.rb b/www/gitlab-ce/files/patch-config_initializers_google__api__client__patch.rb deleted file mode 100644 index a175857e3c92..000000000000 --- a/www/gitlab-ce/files/patch-config_initializers_google__api__client__patch.rb +++ /dev/null @@ -1,11 +0,0 @@ ---- config/initializers/google_api_client_patch.rb.orig 2022-03-09 09:41:27 UTC -+++ config/initializers/google_api_client_patch.rb -@@ -2,7 +2,7 @@ - - require 'google/apis/core/http_command' - --raise 'This patch is only tested with google-api-client-ruby v0.50.0' unless Google::Apis::VERSION == "0.50.0" -+#raise 'This patch is only tested with google-api-client-ruby v0.50.0' unless Google::Apis::VERSION == "0.50.0" - - # The google-api-ruby-client does not have a way to increase or disable - # the maximum allowed time for a request to be retried. By default, it diff --git a/www/gitlab-ce/files/patch-config_puma.rb.example b/www/gitlab-ce/files/patch-config_puma.rb.example index a97d72e0d2fc..54d27a5b7c80 100644 --- a/www/gitlab-ce/files/patch-config_puma.rb.example +++ b/www/gitlab-ce/files/patch-config_puma.rb.example @@ -1,4 +1,4 @@ ---- config/puma.rb.example.orig 2021-05-19 15:44:42 UTC +--- config/puma.rb.example.orig 2022-11-21 09:46:38 UTC +++ config/puma.rb.example @@ -5,11 +5,11 @@ # The default is "config.ru". @@ -32,7 +32,7 @@ on_restart do # Signal application hooks that we're about to restart -@@ -76,7 +76,7 @@ wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LES +@@ -81,7 +81,7 @@ wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LES nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true' # Use json formatter diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message index 6d3d02a3f570..eee8c9132eee 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.5-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/15.6-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.4-15.5-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/15.5-15.6-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at: |