diff options
Diffstat (limited to 'www/gitlab')
| -rw-r--r-- | www/gitlab/Makefile | 166 | ||||
| -rw-r--r-- | www/gitlab/Makefile.common | 5 | ||||
| -rw-r--r-- | www/gitlab/distinfo | 12 | ||||
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 74 | ||||
| -rw-r--r-- | www/gitlab/files/patch-config_gitlab.yml.example | 31 | ||||
| -rw-r--r-- | www/gitlab/files/patch-config_initializers_1__settings.rb | 4 | ||||
| -rw-r--r-- | www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec | 15 | ||||
| -rw-r--r-- | www/gitlab/pkg-message | 4 |
8 files changed, 142 insertions, 169 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 4e58653e1bec..8db1cc48aeb4 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -27,11 +27,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # mail/rubygem-net-smtp is required as ruby 3.1 removed it # textproc/rubygem-psych3 is required as ruby 3.1 applied an update to psych 4.0 which has breaking changes # mail/rubygem-net-pop is required as ruby 3.1 removed it +#gitlab-zoekt-indexer>=0.16.0:textproc/gitlab-zoekt-indexer MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ - gitlab-elasticsearch-indexer>=5.5.0:textproc/gitlab-elasticsearch-indexer \ + gitlab-elasticsearch-indexer>=5.5.1:textproc/gitlab-elasticsearch-indexer \ gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \ gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \ - gitlab-shell>=14.41.0:devel/gitlab-shell \ + gitlab-shell>=14.42.0:devel/gitlab-shell \ gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \ redis>=6.2.11:databases/redis \ yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \ @@ -41,28 +42,28 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-net-smtp>=0:mail/rubygem-net-smtp \ rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \ rubygem-net-pop>=0:mail/rubygem-net-pop \ - rubygem-rails70>=7.0.8.7<7.1:www/rubygem-rails70 \ + rubygem-rails-gitlab>=7.1.5.1<7.2:www/rubygem-rails-gitlab \ rubygem-mutex_m>=0.3<1:devel/rubygem-mutex_m \ rubygem-drb>=2.2.1<3:devel/rubygem-drb \ - rubygem-bootsnap>=1.18.3<1.19:devel/rubygem-bootsnap \ - rubygem-ffi>=1.17.1<2:devel/rubygem-ffi \ + rubygem-bootsnap>=1.18.6<1.19:devel/rubygem-bootsnap \ + rubygem-ffi>=1.17.2<2:devel/rubygem-ffi \ rubygem-openssl>=3.2.0<4:security/rubygem-openssl \ - rubygem-gitlab-secret_detection>=0.23.0<1:security/rubygem-gitlab-secret_detection \ - rubygem-responders-rails70>=3.0<4.0:www/rubygem-responders-rails70 \ - rubygem-sprockets3>=3.7.0<3.8:devel/rubygem-sprockets3 \ - rubygem-sprockets-rails-rails70>=3.5.2<3.6:devel/rubygem-sprockets-rails-rails70 \ - rubygem-view_component-rails70>=3.21.0<3.22:devel/rubygem-view_component-rails70 \ + rubygem-gitlab-secret_detection>=0.29.1<1:security/rubygem-gitlab-secret_detection \ + rubygem-responders-rails-gitlab>=3.0<4.0:www/rubygem-responders-rails-gitlab \ + rubygem-sprockets-gitlab>=3.7.0<3.8:devel/rubygem-sprockets-gitlab \ + rubygem-sprockets-rails-rails-gitlab>=3.5.2<3.6:devel/rubygem-sprockets-rails-rails-gitlab \ + rubygem-view_component-rails-gitlab>=3.23.2<3.24:devel/rubygem-view_component-rails-gitlab \ rubygem-pg>=1.5.9<1.6:databases/rubygem-pg \ rubygem-rugged>=1.6<2:devel/rubygem-rugged \ - rubygem-faraday-gitlab>=2<3:www/rubygem-faraday-gitlab \ + rubygem-faraday-gitlab>=2.13.1<3:www/rubygem-faraday-gitlab \ rubygem-faraday-retry-gitlab>=2<3:www/rubygem-faraday-retry-gitlab \ - rubygem-logger-gitlab>=1.6.0<1.7:devel/rubygem-logger-gitlab \ + rubygem-logger-gitlab>=1.7.0<1.8:devel/rubygem-logger-gitlab \ rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \ rubygem-declarative_policy>=1.1.0<1.2:security/rubygem-declarative_policy \ - rubygem-coverband>=6.1.4<6.1.5:www/rubygem-coverband \ - rubygem-devise-rails70>=4.9.3<4.10:devel/rubygem-devise-rails70 \ + rubygem-coverband>=6.1.5<6.1.6:www/rubygem-coverband \ + rubygem-devise-rails-gitlab>=4.9.3<4.10:devel/rubygem-devise-rails-gitlab \ rubygem-bcrypt>=3.1.20<3.2:security/rubygem-bcrypt \ - rubygem-doorkeeper-rails70>=5.8.1<6:security/rubygem-doorkeeper-rails70 \ + rubygem-doorkeeper-rails-gitlab>=5.8.1<6:security/rubygem-doorkeeper-rails-gitlab \ rubygem-doorkeeper-openid_connect>=1.8.11<2:security/rubygem-doorkeeper-openid_connect \ rubygem-doorkeeper-device_authorization_grant>=1.0.0<1.1:security/rubygem-doorkeeper-device_authorization_grant \ rubygem-rexml>=3.4.1<3.5:textproc/rubygem-rexml \ @@ -85,10 +86,11 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-recaptcha>=5.12<6.0:devel/rubygem-recaptcha \ rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \ rubygem-invisible_captcha>=2.1.0<2.2.0:graphics/rubygem-invisible_captcha \ - rubygem-devise-two-factor41-rails70>=4.1.1<4.2:security/rubygem-devise-two-factor41-rails70 \ + rubygem-devise-two-factor-rails-gitlab>=4.1.1<4.2:security/rubygem-devise-two-factor-rails-gitlab \ rubygem-rqrcode-gitlab>=2.2.0<3:www/rubygem-rqrcode-gitlab \ - rubygem-validates_hostname>=1.0.13<1.1.0:dns/rubygem-validates_hostname \ - rubygem-rubyzip>=2.3.2<2.4:archivers/rubygem-rubyzip \ + rubygem-attr_encrypted>=4.2<5:security/rubygem-attr_encrypted \ + rubygem-validates_hostname-gitlab>=1.0.13<1.1.0:dns/rubygem-validates_hostname-gitlab \ + rubygem-rubyzip-gitlab>=2.4.1<2.5:archivers/rubygem-rubyzip-gitlab \ rubygem-acme-client-gitlab>=2.0.21<3:security/rubygem-acme-client-gitlab \ rubygem-browser5>=5.3.1<5.4:www/rubygem-browser5 \ rubygem-ohai>=18.1.18<19:sysutils/rubygem-ohai \ @@ -105,14 +107,16 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-apollo_upload_server>=2.1.6<2.2:net/rubygem-apollo_upload_server \ rubygem-ffaker>=2.24.0<3:devel/rubygem-ffaker \ rubygem-hashie>=5.0.0<5.1:devel/rubygem-hashie \ - rubygem-kaminari-rails70>=1.2.2<1.3:www/rubygem-kaminari-rails70 \ + rubygem-kaminari-rails-gitlab>=1.2.2<1.3:www/rubygem-kaminari-rails-gitlab \ rubygem-hamlit>=2.15.0<2.16:www/rubygem-hamlit \ - rubygem-carrierwave1>=1.3.4<2.0:www/rubygem-carrierwave1 \ + rubygem-carrierwave-gitlab>=1.3.4<2.0:www/rubygem-carrierwave-gitlab \ rubygem-mini_magick4>=4.12<5:graphics/rubygem-mini_magick4 \ - rubygem-fog-aws328>=3.26<4:net/rubygem-fog-aws328 \ - rubygem-fog-core210>=2.1.0<2.1.1:devel/rubygem-fog-core210 \ + rubygem-prawn>=0:print/rubygem-prawn \ + rubygem-prawn-svg>=0:print/rubygem-prawn-svg \ + rubygem-fog-aws-gitlab>=3.26<4:net/rubygem-fog-aws-gitlab \ + rubygem-fog-core-gitlab>=2.1.0<2.1.1:devel/rubygem-fog-core-gitlab \ rubygem-fog-google-gitlab>=1.24.1<1.25:net/rubygem-fog-google-gitlab \ - rubygem-fog-local>=0.8<1.0:net/rubygem-fog-local \ + rubygem-fog-local-gitlab>=0.8<1.0:net/rubygem-fog-local-gitlab \ rubygem-fog-aliyun-gitlab>=0.4<1.0:net/rubygem-fog-aliyun-gitlab \ rubygem-gitlab-fog-azure-rm>=2.2.0<2.3:net/rubygem-gitlab-fog-azure-rm \ rubygem-google-apis-storage_v1-gitlab>=0.29<1:devel/rubygem-google-apis-storage_v1-gitlab \ @@ -130,18 +134,18 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-googleauth-gitlab>=1.8.1<2:security/rubygem-googleauth-gitlab \ rubygem-google-cloud-artifact_registry-v1>=0.11.0<0.12:textproc/rubygem-google-cloud-artifact_registry-v1 \ rubygem-google-cloud-compute-v1>=2.6.0<2.7:net/rubygem-google-cloud-compute-v1 \ - rubygem-seed-fu>=2.3.9<2.4.0:databases/rubygem-seed-fu \ + rubygem-seed-fu-gitlab>=2.3.9<2.4.0:databases/rubygem-seed-fu-gitlab \ rubygem-elasticsearch-model-gitlab>=7.2<8:textproc/rubygem-elasticsearch-model-gitlab \ rubygem-elasticsearch-rails7>=7.2<8:textproc/rubygem-elasticsearch-rails7 \ rubygem-elasticsearch-api-gitlab>=7.17.11<7.18:textproc/rubygem-elasticsearch-api-gitlab \ - rubygem-aws-sdk-core-gitlab>=3.215.0<3.216:devel/rubygem-aws-sdk-core-gitlab \ - rubygem-aws-sdk-cloudformation-gitlab>=1<2:devel/rubygem-aws-sdk-cloudformation-gitlab \ - rubygem-aws-sdk-s3-gitlab>=1.177.0<1.178:devel/rubygem-aws-sdk-s3-gitlab \ + rubygem-aws-sdk-core-gitlab>=3.225.0<3.226:devel/rubygem-aws-sdk-core-gitlab \ + rubygem-aws-sdk-cloudformation-gitlab>=1.131<2:devel/rubygem-aws-sdk-cloudformation-gitlab \ + rubygem-aws-sdk-s3-gitlab>=1.189.0<1.190:devel/rubygem-aws-sdk-s3-gitlab \ rubygem-faraday-typhoeus-gitlab>=1.1<2:www/rubygem-faraday-typhoeus-gitlab \ rubygem-faraday_middleware-aws-sigv4-gitlab>=1.0.1<1.1:devel/rubygem-faraday_middleware-aws-sigv4-gitlab \ 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.4<2.4:www/rubygem-deckar01-task_list \ + rubygem-html-pipeline-gitlab>=2.14.3<2.15:textproc/rubygem-html-pipeline-gitlab \ + rubygem-deckar01-task_list-gitlab>=2.3.4<2.4:www/rubygem-deckar01-task_list-gitlab \ rubygem-gitlab-markup>=2.0.0<2.1:textproc/rubygem-gitlab-markup \ rubygem-commonmarker0>=0.23.10<0.24:textproc/rubygem-commonmarker0 \ rubygem-kramdown-gitlab>=2.5.1<2.6:textproc/rubygem-kramdown-gitlab \ @@ -153,36 +157,35 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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.10.0<0.11:textproc/rubygem-asciidoctor-kroki \ - rubygem-rouge-gitlab>=4.5.1<4.6:textproc/rubygem-rouge-gitlab \ + rubygem-rouge-gitlab>=4.5.2<4.6:textproc/rubygem-rouge-gitlab \ rubygem-truncato>=0.7.13<0.8.0:textproc/rubygem-truncato \ rubygem-nokogiri>=1.18.7<2:textproc/rubygem-nokogiri \ - rubygem-gitlab-glfm-markdown>=0.0.29<0.1:textproc/rubygem-gitlab-glfm-markdown \ + rubygem-gitlab-glfm-markdown>=0.0.31<0.1:textproc/rubygem-gitlab-glfm-markdown \ rubygem-tanuki_emoji>=0.13<1:graphics/rubygem-tanuki_emoji \ rubygem-unicode-emoji>=4.0.4<5:devel/rubygem-unicode-emoji \ rubygem-icalendar-gitlab>=2.10.3<2.11:devel/rubygem-icalendar-gitlab \ - rubygem-diffy>=3.4<4:textproc/rubygem-diffy \ + rubygem-diffy>=3.4.4<4:textproc/rubygem-diffy \ rubygem-rack22>=2.2.13,3<2.3,3:www/rubygem-rack22 \ rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \ - rubygem-puma>=6.5.0<7:www/rubygem-puma \ + rubygem-puma>=6.6.0<6.6.1:www/rubygem-puma \ rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \ - rubygem-state_machines-activerecord08>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord08 \ + rubygem-state_machines-activerecord-gitlab>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord-gitlab \ rubygem-sidekiq-gitlab>=7.3.9:devel/rubygem-sidekiq-gitlab \ - rubygem-sidekiq-cron-rails70>=1.12.0<1.13:devel/rubygem-sidekiq-cron-rails70 \ + rubygem-sidekiq-cron-rails-gitlab>=1.12.0<1.13:devel/rubygem-sidekiq-cron-rails-gitlab \ rubygem-fugit>=1.11.1<1.12:devel/rubygem-fugit \ - rubygem-httparty-gitlab>=0.22.0<0.23:www/rubygem-httparty-gitlab \ + rubygem-httparty-gitlab>=0.23.0<0.24:www/rubygem-httparty-gitlab \ rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \ rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \ rubygem-re2>=2.15.0<3:devel/rubygem-re2 \ - rubygem-semver_dialects>=3.6.0<4:devel/rubygem-semver_dialects \ + rubygem-semver_dialects>=3.7.0<4:devel/rubygem-semver_dialects \ rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \ rubygem-js_regex>=3.8<4.0:textproc/rubygem-js_regex \ - rubygem-device_detector>=0:devel/rubygem-device_detector \ + rubygem-device_detector>=1.1.3:devel/rubygem-device_detector \ rubygem-redis>=5.4.0<5.5:databases/rubygem-redis \ rubygem-redis-clustering>=5.4.0<5.5:databases/rubygem-redis-clustering \ - rubygem-connection_pool>=2.5.0<3.0:net/rubygem-connection_pool \ - rubygem-redis-actionpack-rails70>=5.5.0<5.6:databases/rubygem-redis-actionpack-rails70 \ - rubygem-discordrb-webhooks>=3.5<4.0:net-im/rubygem-discordrb-webhooks \ - rubygem-jira-ruby>=2.3.0<2.4:devel/rubygem-jira-ruby \ + rubygem-connection_pool>=2.5.3<2.6:net/rubygem-connection_pool \ + rubygem-redis-actionpack-rails-gitlab>=5.5.0<5.6:databases/rubygem-redis-actionpack-rails-gitlab \ + rubygem-jira-ruby-gitlab>=2.3.0<2.4:devel/rubygem-jira-ruby-gitlab \ rubygem-atlassian-jwt>=0.2.1<0.3.0:www/rubygem-atlassian-jwt \ rubygem-slack-messenger>=2.3.5<2.4.0:devel/rubygem-slack-messenger \ rubygem-ruby-fogbugz>=0.3.0<0.4.0:devel/rubygem-ruby-fogbugz \ @@ -191,7 +194,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-circuitbox>=2.0.0<2.1:www/rubygem-circuitbox \ rubygem-sanitize60>=6.0.2<6.1:textproc/rubygem-sanitize60 \ rubygem-babosa>=2.0<3:textproc/rubygem-babosa \ - rubygem-loofah>=2.24.0<2.25:textproc/rubygem-loofah \ + rubygem-loofah>=2.24.1<2.25:textproc/rubygem-loofah \ rubygem-licensee-gitlab>=9.16<10:devel/rubygem-licensee-gitlab \ rubygem-charlock_holmes>=0.7.9<0.8:textproc/rubygem-charlock_holmes \ rubygem-ruby-magic>=0.6<1:devel/rubygem-ruby-magic \ @@ -199,31 +202,31 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-gitlab-chronic>=0.10.6<0.11.0:devel/rubygem-gitlab-chronic \ rubygem-gitlab_chronic_duration>=0.12<1:devel/rubygem-gitlab_chronic_duration \ rubygem-rack-proxy>=0.7.7<0.8.0:www/rubygem-rack-proxy \ - rubygem-cssbundling-rails-rails70>=1.4.3<1.5:www/rubygem-cssbundling-rails-rails70 \ + rubygem-cssbundling-rails-rails-gitlab>=1.4.3<1.5:www/rubygem-cssbundling-rails-rails-gitlab \ rubygem-terser>=1.0.2<1.0.3:textproc/rubygem-terser \ rubygem-addressable>=2.8<3:www/rubygem-addressable \ - rubygem-gon-rails70>=6.4.0<6.5:www/rubygem-gon-rails70 \ + rubygem-gon-rails-gitlab>=6.4.0<6.5:www/rubygem-gon-rails-gitlab \ rubygem-request_store>=1.7.0<1.8:devel/rubygem-request_store \ rubygem-base32>=0.3.4<0.4.0:converters/rubygem-base32 \ rubygem-gitlab-license>=2.6<3:devel/rubygem-gitlab-license \ rubygem-rack-attack>=6.7.0<6.8:www/rubygem-rack-attack \ - rubygem-sentry-ruby>=5.22.0<5.23:devel/rubygem-sentry-ruby \ - rubygem-sentry-rails>=5.22.0<5.23:devel/rubygem-sentry-rails \ - rubygem-sentry-sidekiq>=5.22.0<5.23:devel/rubygem-sentry-sidekiq \ + rubygem-sentry-ruby>=5.23.0<5.24:devel/rubygem-sentry-ruby \ + rubygem-sentry-rails>=5.23.0<5.24:devel/rubygem-sentry-rails \ + rubygem-sentry-sidekiq>=5.23.0<5.24:devel/rubygem-sentry-sidekiq \ rubygem-pg_query>=6.1.0<6.2:databases/rubygem-pg_query \ - rubygem-premailer-rails-rails70>=1.12.0<1.13:mail/rubygem-premailer-rails-rails70 \ + rubygem-premailer-rails-rails-gitlab>=1.12.0<1.13:mail/rubygem-premailer-rails-rails-gitlab \ rubygem-gitlab-labkit>=0.37.0<0.38:devel/rubygem-gitlab-labkit \ rubygem-thrift>=0.16.0:devel/rubygem-thrift \ - rubygem-rails-i18n-rails70>=7.0.9<8:devel/rubygem-rails-i18n-rails70 \ + rubygem-rails-i18n-rails-gitlab>=7.0.9<8:devel/rubygem-rails-i18n-rails-gitlab \ rubygem-gettext_i18n_rails>=1.13.0<1.14:devel/rubygem-gettext_i18n_rails \ rubygem-gettext>=3.5.1<4:devel/rubygem-gettext \ rubygem-batch-loader>=2.0.5<2.1:devel/rubygem-batch-loader \ rubygem-tty-prompt>=0.23<1:devel/rubygem-tty-prompt \ - rubygem-peek-rails70>=1.1<2.0:devel/rubygem-peek-rails70 \ + rubygem-peek-rails-gitlab>=1.1<2.0:devel/rubygem-peek-rails-gitlab \ rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \ - rubygem-webrick>=1.8.2<1.10:www/rubygem-webrick \ - rubygem-prometheus-client-mmap>=1.2.9<1.3:devel/rubygem-prometheus-client-mmap \ - rubygem-async-gitlab>=2.23.1<2.24:devel/rubygem-async-gitlab \ + rubygem-webrick>=1.9.0<1.10:www/rubygem-webrick \ + rubygem-prometheus-client-mmap>=1.2.10<1.3:devel/rubygem-prometheus-client-mmap \ + rubygem-async-gitlab>=2.24.0<2.25:devel/rubygem-async-gitlab \ rubygem-gitlab-security_report_schemas>=0.1.2.min15.0.0.max15.2.1<0.1.2.min15.0.0.max15.2.2:devel/rubygem-gitlab-security_report_schemas \ rubygem-opentelemetry-sdk>=1.5.0:devel/rubygem-opentelemetry-sdk \ rubygem-opentelemetry-exporter-otlp>=0.29.1:devel/rubygem-opentelemetry-exporter-otlp \ @@ -250,7 +253,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-opentelemetry-instrumentation-sidekiq>=0.25.7:devel/rubygem-opentelemetry-instrumentation-sidekiq \ rubygem-warning>=1.5.0<1.6:devel/rubygem-warning \ rubygem-git>=1.19.1<2:devel/rubygem-git \ - rubygem-gitlab-dangerfiles>=4.8.1<4.9:devel/rubygem-gitlab-dangerfiles \ + rubygem-gitlab-dangerfiles>=4.9.2<4.10:devel/rubygem-gitlab-dangerfiles \ rubygem-license_finder-gitlab>=7.2.1<8:devel/rubygem-license_finder-gitlab \ rubygem-rspec>=3.0<4:devel/rubygem-rspec \ rubygem-octokit-gitlab>=9.0<10:net/rubygem-octokit-gitlab \ @@ -262,26 +265,26 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-rbtrace>=0.4.14<1.0:devel/rubygem-rbtrace \ rubygem-memory_profiler>=1.0<2.0:devel/rubygem-memory_profiler \ rubygem-activerecord-explain-analyze>=0.1<1.0:databases/rubygem-activerecord-explain-analyze \ - rubygem-oauth2-gitlab>=2.0<3:net/rubygem-oauth2-gitlab \ - rubygem-health_check-rails70>=3.0<4:devel/rubygem-health_check-rails70 \ + rubygem-oauth2-gitlab>=2.0.10<3:net/rubygem-oauth2-gitlab \ + rubygem-health_check-rails-gitlab>=3.0<4:devel/rubygem-health_check-rails-gitlab \ rubygem-vmstat>=2.3.1<2.4.0:sysutils/rubygem-vmstat \ rubygem-sys-filesystem14>=1.4.3<1.5:sysutils/rubygem-sys-filesystem14 \ rubygem-net-ntp>0:net/rubygem-net-ntp \ rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \ rubygem-spamcheck>=1.3.3<1.4:net/rubygem-spamcheck \ - rubygem-gitaly>=17.8.4:net/rubygem-gitaly \ + rubygem-gitaly>=18.1.0:net/rubygem-gitaly \ rubygem-gitlab-kas-grpc>=${GITLAB_KAS_GRPC_VERSION}:net/rubygem-gitlab-kas-grpc \ - rubygem-grpc>=1.63.0<2:net/rubygem-grpc \ - rubygem-google-protobuf3>=3.25.6<4:devel/rubygem-google-protobuf3 \ + rubygem-grpc-gitlab>=1.72.0<2:net/rubygem-grpc-gitlab \ + rubygem-google-protobuf3>=3.25.8<4:devel/rubygem-google-protobuf3 \ rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \ rubygem-flipper-gitlab>=0.28.0<0.29:devel/rubygem-flipper-gitlab \ - rubygem-flipper-active_record-rails70>=0.28.0<0.29:databases/rubygem-flipper-active_record-rails70 \ - rubygem-flipper-active_support_cache_store-rails70>=0.28.0<0.29:devel/rubygem-flipper-active_support_cache_store-rails70 \ + rubygem-flipper-active_record-rails-gitlab>=0.28.0<0.29:databases/rubygem-flipper-active_record-rails-gitlab \ + rubygem-flipper-active_support_cache_store-rails-gitlab>=0.28.0<0.29:devel/rubygem-flipper-active_support_cache_store-rails-gitlab \ rubygem-unleash>=3.2.2<3.3:devel/rubygem-unleash \ rubygem-gitlab-experiment>=0.9.1<0.10:devel/rubygem-gitlab-experiment \ - rubygem-lograge-rails70>=0.11.2<1.0:www/rubygem-lograge-rails70 \ - rubygem-grape_logging>=1.8.4<2.0:devel/rubygem-grape_logging \ - rubygem-gitlab-net-dns>=0.10.0<0.11:dns/rubygem-gitlab-net-dns \ + rubygem-lograge-rails-gitlab>=0.11.2<1.0:www/rubygem-lograge-rails-gitlab \ + rubygem-grape_logging-gitlab>=1.8.4<2.0:devel/rubygem-grape_logging-gitlab \ + rubygem-gitlab-net-dns>=0.12.0<0.13:dns/rubygem-gitlab-net-dns \ 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 \ @@ -289,19 +292,19 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-lockbox>=1.3.0<1.4:security/rubygem-lockbox \ rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \ rubygem-jsonb_accessor>=1.4<2:www/rubygem-jsonb_accessor \ - rubygem-json>=2.10.2<2.11:devel/rubygem-json \ + rubygem-json-gitlab>=2.11.2<2.12:devel/rubygem-json-gitlab \ rubygem-json_schemer>=2.3.0<2.4:devel/rubygem-json_schemer \ - rubygem-oj>=3.16.0<3.17:devel/rubygem-oj \ + rubygem-oj>=3.16.11<3.17:devel/rubygem-oj \ rubygem-oj-introspect>=0.8<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>=3.0<4:security/rubygem-webauthn \ rubygem-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \ rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1 \ - rubygem-ed25519>=1.3.0<1.4:security/rubygem-ed25519 \ + rubygem-ed25519>=1.4.0<1.5:security/rubygem-ed25519 \ rubygem-cvss-suite>=3.3.0<3.4:security/rubygem-cvss-suite \ rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \ - rubygem-devfile>=0.4.3<0.5:net/rubygem-devfile \ + rubygem-devfile>=0.4.4<0.5:net/rubygem-devfile \ rubygem-CFPropertyList-gitlab>=3.0.7<3.1:devel/rubygem-CFPropertyList-gitlab \ rubygem-app_store_connect>=0:net/rubygem-app_store_connect \ rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \ @@ -311,11 +314,11 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-uri-gitlab>=0.13.2<0.13.3:net/rubygem-uri-gitlab \ rubygem-duo_api>=1.4<2:security/rubygem-duo_api \ rubygem-gitlab-sdk>=0.3.0<0.4:devel/rubygem-gitlab-sdk \ - rubygem-paper_trail>=15.0<16:devel/rubygem-paper_trail \ + rubygem-paper_trail>=16.0<17:devel/rubygem-paper_trail \ rubygem-i18n_data>=0.13.1<1:devel/rubygem-i18n_data \ - rubygem-gitlab-cloud-connector>=1.5<2:security/rubygem-gitlab-cloud-connector \ + rubygem-gitlab-cloud-connector>=1.17<2:security/rubygem-gitlab-cloud-connector \ rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 \ - rubygem-parallel>=1.26.3<2:sysutils/rubygem-parallel \ + rubygem-parallel>=1.27.0<2:sysutils/rubygem-parallel \ rubygem-google-cloud-storage_transfer-gitlab>=1.2.0<1.3:net/rubygem-google-cloud-storage_transfer-gitlab \ rubygem-minitest>=5.11<6:devel/rubygem-minitest \ rubygem-grpc-tools>=1.69.0<1.70:net/rubygem-grpc-tools \ @@ -488,8 +491,6 @@ post-install: @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/2_plan" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/4_verify" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/5_package" >> ${TMPPLIST} - @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/6_release" >> ${TMPPLIST} - @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/7_configure" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/8_monitor" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/5_package" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/8_monitor" >> ${TMPPLIST} @@ -534,9 +535,7 @@ post-install: @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/gems/gitlab-backup-cli/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/4_verify" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/5_package" >> ${TMPPLIST} - @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/6_release" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/8_monitor" >> ${TMPPLIST} - @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/browser_ui/7_configure" >> ${TMPPLIST} .endif .if !defined(_GITLAB_MAKESUM_GUARD) @@ -550,6 +549,21 @@ makesum: (cd ../../www/gitlab-pages && ${MAKE} makesum) (cd ../../www/gitlab-workhorse && ${MAKE} makesum) (cd ../../net/rubygem-gitlab-kas-grpc && ${MAKE} makesum) + (cd ../../www/rubygem-rails-gitlab && ${MAKE} makesum) + (cd ../../www/rubygem-actioncable-gitlab && ${MAKE} makesum) + (cd ../../mail/rubygem-actionmailbox-gitlab && ${MAKE} makesum) + (cd ../../mail/rubygem-actionmailer-gitlab && ${MAKE} makesum) + (cd ../../www/rubygem-actionpack-gitlab && ${MAKE} makesum) + (cd ../../textproc/rubygem-actiontext-gitlab && ${MAKE} makesum) + (cd ../../devel/rubygem-actionview-gitlab && ${MAKE} makesum) + (cd ../../devel/rubygem-activejob-gitlab && ${MAKE} makesum) + (cd ../../databases/rubygem-activemodel-gitlab && ${MAKE} makesum) + (cd ../../databases/rubygem-activerecord-gitlab && ${MAKE} makesum) + (cd ../../net/rubygem-activestorage-gitlab && ${MAKE} makesum) + (cd ../../devel/rubygem-activesupport-gitlab && ${MAKE} makesum) + (cd ../../www/rubygem-railties-gitlab && ${MAKE} makesum) + (cd ../../databases/rubygem-globalid-rails-gitlab && ${MAKE} makesum) + (cd ../../www/rubygem-responders-rails-gitlab && ${MAKE} makesum) .endif diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index f90240ab03de..864063c1365a 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,4 +1,4 @@ -GITLAB_VERSION= 17.11.2 +GITLAB_VERSION= 18.1.1 GITLAB_PORTREVISION= 0 # Git version gitaly should use (from gitlab mirror) @@ -12,3 +12,6 @@ GITLAB_GIT_VERSION_SHORT= ${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/} GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION} #GITLAB_KAS_GRPC_VERSION= 17.11.0.pre.rc43 +# Rails version +RAILS_VERSION= 7.1.5.1 + diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index 481d3318a987..f3d977a2ab27 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1746703370 -SHA256 (gitlab-foss-v17.11.2.tar.bz2) = cca1c17742e83a3449b262980ce6522c713eeb9f50dcba4bb831d4e3b32b8ca6 -SIZE (gitlab-foss-v17.11.2.tar.bz2) = 127999225 -TIMESTAMP = 1746703439 -SHA256 (gitlab-v17.11.2-ee.tar.bz2) = 972e2fd9d5dcc6de5472fe720e369a2a3be9eb3c27208d6e82b2e9135bbd0b41 -SIZE (gitlab-v17.11.2-ee.tar.bz2) = 142504844 +TIMESTAMP = 1750904269 +SHA256 (gitlab-foss-v18.1.1.tar.bz2) = f88fcf557bad4ed378c12b2cca9321e6014d4aae4426ddb6cde185a6ecb54d11 +SIZE (gitlab-foss-v18.1.1.tar.bz2) = 119445108 +TIMESTAMP = 1750904310 +SHA256 (gitlab-v18.1.1-ee.tar.bz2) = e2b052cee4fff6330558b78ac6efd3619681b95b7dd949961267c1370aecdd21 +SIZE (gitlab-v18.1.1-ee.tar.bz2) = 134748693 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 408e873e25c9..704da6697d22 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,6 +1,6 @@ ---- Gemfile.orig 2025-05-07 09:41:59 UTC +--- Gemfile.orig 2025-06-18 04:18:20 UTC +++ Gemfile -@@ -168,8 +168,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea +@@ -164,8 +164,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared # GraphQL API @@ -29,15 +29,6 @@ gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared -@@ -287,7 +287,7 @@ group :puma do - gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared - - group :puma do -- gem 'puma', '= 6.5.0', require: false, feature_category: :shared -+ gem 'puma', '~> 6.5', require: false, feature_category: :shared - gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared - end - @@ -295,7 +295,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared @@ -47,23 +38,16 @@ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -433,7 +433,7 @@ gem 'snowplow-tracker', '~> 0.8.0', feature_category: - gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics - - # Metrics --gem 'webrick', '~> 1.8.1', require: false, feature_category: :shared -+gem 'webrick', '~> 1.8', require: false, feature_category: :shared - gem 'prometheus-client-mmap', '~> 1.2.8', require: 'prometheus/client', feature_category: :shared - - # Event-driven reactor for Ruby -@@ -475,140 +475,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared +@@ -472,143 +472,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared gem 'warning', '~> 1.5.0', feature_category: :shared -group :development do - gem 'lefthook', '~> 1.11.0', require: false, feature_category: :tooling - gem 'rubocop', feature_category: :tooling -- gem 'solargraph', '~> 0.47.2', require: false, feature_category: :shared +- +- gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared +- gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared - - gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared - gem 'lookbook', '~> 2.3', feature_category: :shared @@ -90,9 +74,9 @@ -end - -group :development, :test do -- gem 'deprecation_toolkit', '~> 1.5.1', require: false, feature_category: :shared -- gem 'bullet', '~> 7.2.0', feature_category: :shared -- gem 'parser', '= 3.3.7.1', feature_category: :shared +- gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared +- gem 'bullet', '~> 8.0.0', feature_category: :shared +- gem 'parser', '= 3.3.8.0', feature_category: :shared - gem 'pry-byebug', feature_category: :shared - gem 'pry-rails', '~> 0.3.9', feature_category: :shared - gem 'pry-shell', '~> 0.6.4', feature_category: :shared @@ -100,7 +84,7 @@ - gem 'awesome_print', require: false, feature_category: :shared - - gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database -- gem 'rspec-rails', '~> 7.0.0', feature_category: :shared +- gem 'rspec-rails', '~> 7.1.0', feature_category: :shared - gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling - - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) @@ -120,7 +104,7 @@ - gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling - - gem 'knapsack', '~> 4.0.0', feature_category: :tooling -- gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling +- gem 'gitlab-crystalball', '~> 1.1.0', require: false, feature_category: :tooling - gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling - - gem 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared @@ -144,7 +128,7 @@ -end - group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 4.8.0', require: false, feature_category: :tooling + gem 'gitlab-dangerfiles', '~> 4.9.0', require: false, feature_category: :tooling end -group :development, :test, :coverage do @@ -187,38 +171,28 @@ - gem 'rspec_junit_formatter', feature_category: :shared - gem 'guard-rspec', feature_category: :shared - gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling +- gem 'state_machines-rspec', '~> 0.6', feature_category: :shared - - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false, feature_category: :shared - -- gem 'gitlab_quality-test_tooling', '~> 2.8.0', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 2.10.0', require: false, feature_category: :tooling -end - gem 'octokit', '~> 9.0', feature_category: :importers # Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688 gem 'faraday-multipart', '~> 1.0', feature_category: :importers -@@ -643,16 +518,16 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside - gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat - - # Gitaly GRPC protocol definitions --gem 'gitaly', '~> 17.8.0', feature_category: :gitaly -+gem 'gitaly', '~> 17.8', feature_category: :gitaly +@@ -646,7 +518,7 @@ gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: : + gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :gitaly # KAS GRPC protocol definitions --gem 'gitlab-kas-grpc', '~> 17.9.0.pre.rc2', feature_category: :deployment_management -+gem 'gitlab-kas-grpc', '~> 17.9', feature_category: :deployment_management - - # Lock the version before issues below are resolved: - # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 - # Or we can upgrade to a more recent version as long as we can confirm - # that it doesn't have the same issues. --gem 'grpc', '= 1.63.0', feature_category: :shared -+gem 'grpc', '~> 1.63', feature_category: :shared +-gem 'gitlab-kas-grpc', '~> 17.11.0', feature_category: :deployment_management ++gem 'gitlab-kas-grpc', '~> 18.1.0', feature_category: :deployment_management - gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared + gem 'grpc', '~> 1.72.0', feature_category: :shared -@@ -673,7 +548,7 @@ gem 'gitlab-net-dns', '~> 0.10.0', feature_category: : - gem 'gitlab-net-dns', '~> 0.10.0', feature_category: :shared +@@ -669,7 +541,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: : + gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :shared # Countries list -gem 'countries', '~> 4.0.0', feature_category: :shared @@ -226,7 +200,7 @@ gem 'retriable', '~> 3.1.2', feature_category: :shared -@@ -754,10 +629,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -750,10 +622,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access @@ -237,9 +211,9 @@ + gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation - gem 'paper_trail', '~> 15.0', feature_category: :shared + gem 'paper_trail', '~> 16.0', feature_category: :shared -gem "i18n_data", "~> 0.13.1", feature_category: :system_access +gem "i18n_data", "~> 0.13", feature_category: :system_access - gem "gitlab-cloud-connector", "~> 1.5", require: 'gitlab/cloud_connector', feature_category: :cloud_connector + gem "gitlab-cloud-connector", "~> 1.14", require: 'gitlab/cloud_connector', feature_category: :cloud_connector diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index 09cb658db5d2..334de9d0c6fb 100644 --- a/www/gitlab/files/patch-config_gitlab.yml.example +++ b/www/gitlab/files/patch-config_gitlab.yml.example @@ -1,6 +1,6 @@ ---- config/gitlab.yml.example.orig 2025-04-16 04:05:48 UTC +--- config/gitlab.yml.example.orig 2025-06-18 04:18:20 UTC +++ config/gitlab.yml.example -@@ -484,7 +484,7 @@ production: &base +@@ -493,7 +493,7 @@ production: &base ## GitLab Pages pages: enabled: false @@ -9,20 +9,7 @@ # The location where pages are stored (default: shared/pages). # path: shared/pages -@@ -494,9 +494,9 @@ production: &base - host: example.com - port: 80 # Set to 443 if you serve the pages with HTTPS - https: false # Set to true if you serve the pages with HTTPS -- artifacts_server: true # Set to false if you want to disable online view of HTML artifacts -- # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages -- # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages -+ artifacts_server: false # Set to false if you want to disable online view of HTML artifacts -+ external_http: ["127.0.0.1:8090"] # If defined, enables custom domain support in GitLab Pages -+ # external_https: ["127.0.0.1:8090"] # If defined, enables custom domain and certificate support in GitLab Pages - - # File that contains the shared secret key for verifying access for gitlab-pages. - # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app). -@@ -1227,13 +1227,13 @@ production: &base +@@ -1238,13 +1238,13 @@ production: &base repositories: storages: # You must have at least a `default` storage path. default: @@ -38,7 +25,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 -@@ -1268,12 +1268,12 @@ production: &base +@@ -1279,12 +1279,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -54,7 +41,7 @@ # Git over HTTP upload_pack: true -@@ -1288,7 +1288,7 @@ production: &base +@@ -1299,7 +1299,7 @@ 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). @@ -63,7 +50,7 @@ cell: # enabled: false -@@ -1306,7 +1306,7 @@ production: &base +@@ -1317,7 +1317,7 @@ production: &base # enabled: true # File that contains the secret key for verifying access for gitlab-kas. # Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app). @@ -72,7 +59,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1333,13 +1333,13 @@ production: &base +@@ -1344,13 +1344,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -88,7 +75,7 @@ ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1360,18 +1360,18 @@ production: &base +@@ -1371,18 +1371,18 @@ production: &base # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq. sidekiq_exporter: @@ -114,7 +101,7 @@ # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. web_exporter: -@@ -1598,13 +1598,13 @@ test: +@@ -1609,13 +1609,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: diff --git a/www/gitlab/files/patch-config_initializers_1__settings.rb b/www/gitlab/files/patch-config_initializers_1__settings.rb index 2c8adc9a51e9..6a3c4491eb22 100644 --- a/www/gitlab/files/patch-config_initializers_1__settings.rb +++ b/www/gitlab/files/patch-config_initializers_1__settings.rb @@ -1,6 +1,6 @@ ---- config/initializers/1_settings.rb.orig 2025-03-19 10:41:02 UTC +--- config/initializers/1_settings.rb.orig 2025-05-14 17:45:50 UTC +++ config/initializers/1_settings.rb -@@ -215,11 +215,7 @@ Settings.gitlab['ssh_user'] ||= Settings.gitlab.user +@@ -216,11 +216,7 @@ Settings.gitlab['ssh_user'] ||= Settings.gitlab.user 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/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec b/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec index 7346dbb850eb..cf08a9593f99 100644 --- a/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec +++ b/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec @@ -1,20 +1,15 @@ ---- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2025-03-19 10:41:02 UTC +--- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2025-06-18 04:18:20 UTC +++ gems/gitlab-backup-cli/gitlab-backup-cli.gemspec -@@ -26,7 +26,7 @@ Gem::Specification.new do |spec| - +@@ -27,7 +27,7 @@ Gem::Specification.new do |spec| spec.add_dependency "activerecord", ">= 7" spec.add_dependency "activesupport", ">= 7" + spec.add_dependency "bigdecimal", "~> 3.1" - spec.add_dependency "googleauth", "~> 1.8.1" # https://gitlab.com/gitlab-org/gitlab/-/issues/449019 + spec.add_dependency "googleauth", "~> 1.8" # https://gitlab.com/gitlab-org/gitlab/-/issues/449019 spec.add_dependency "google-cloud-storage_transfer", "~> 1.2.0" + spec.add_dependency "mutex_m", "~> 0.3" spec.add_dependency "pg", "~> 1.5.6" - spec.add_dependency "rainbow", "~> 3.0" -@@ -38,11 +38,11 @@ Gem::Specification.new do |spec| - spec.add_dependency "concurrent-ruby", "~> 1.1" - spec.add_dependency "faraday", "~> 2" - spec.add_dependency "google-protobuf", "~> 3.25", ">= 3.25.3" -- spec.add_dependency "grpc", "= 1.63.0" -+ spec.add_dependency "grpc", "~> 1.63" +@@ -44,7 +44,7 @@ Gem::Specification.new do |spec| spec.add_dependency "json", "~> 2.7" spec.add_dependency "jwt", "~> 2.5" spec.add_dependency "logger", "~> 1.5" diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message index 6428be5f3115..d736f45ba52d 100644 --- a/www/gitlab/pkg-message +++ b/www/gitlab/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.com/mfechner/freebsd-gitlab-docu/blob/master/install/17.11-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.1-freebsd.md EOM type: install } @@ -20,7 +20,7 @@ EOM If you just installed an major upgrade of GitLab, for example you switched from 17.9.x to 17.10.x, please follow the instructions in the guide at: -https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/17.10-17.11-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.0-18.1-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at: |