summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/Makefile12
-rw-r--r--www/firefox-esr/Makefile2
-rw-r--r--www/firefox-esr/distinfo6
-rw-r--r--www/gitlab-pages/distinfo10
-rw-r--r--www/gitlab-workhorse/distinfo10
-rw-r--r--www/gitlab/Makefile94
-rw-r--r--www/gitlab/Makefile.common7
-rw-r--r--www/gitlab/distinfo12
-rw-r--r--www/gitlab/files/patch-Gemfile54
-rw-r--r--www/gitlab/files/patch-config_gitlab.yml.example20
-rw-r--r--www/gitlab/files/patch-config_initializers_1__settings.rb4
-rw-r--r--www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec10
-rw-r--r--www/gitlab/pkg-message4
-rw-r--r--www/homer-web/Makefile2
-rw-r--r--www/homer-web/distinfo6
-rw-r--r--www/homer-web/pkg-plist119
-rw-r--r--www/librewolf/Makefile2
-rw-r--r--www/librewolf/distinfo6
-rw-r--r--www/nginx-devel/Makefile2
-rw-r--r--www/nginx-devel/Makefile.extmod6
-rw-r--r--www/nginx-devel/distinfo6
-rw-r--r--www/py-httpx-retries/Makefile2
-rw-r--r--www/py-httpx-retries/distinfo6
-rw-r--r--www/rubygem-actioncable-gitlab/Makefile28
-rw-r--r--www/rubygem-actioncable-gitlab/distinfo3
-rw-r--r--www/rubygem-actioncable-gitlab/pkg-descr7
-rw-r--r--www/rubygem-actionpack-gitlab/Makefile32
-rw-r--r--www/rubygem-actionpack-gitlab/distinfo3
-rw-r--r--www/rubygem-actionpack-gitlab/pkg-descr19
-rw-r--r--www/rubygem-coverband/Makefile5
-rw-r--r--www/rubygem-coverband/distinfo6
-rw-r--r--www/rubygem-cssbundling-rails-rails-gitlab/Makefile20
-rw-r--r--www/rubygem-cssbundling-rails-rails-gitlab/distinfo3
-rw-r--r--www/rubygem-cssbundling-rails-rails-gitlab/pkg-descr12
-rw-r--r--www/rubygem-gon-rails-gitlab/Makefile24
-rw-r--r--www/rubygem-gon-rails-gitlab/distinfo3
-rw-r--r--www/rubygem-gon-rails-gitlab/pkg-descr2
-rw-r--r--www/rubygem-kaminari-actionview-rails-gitlab/Makefile21
-rw-r--r--www/rubygem-kaminari-actionview-rails-gitlab/distinfo3
-rw-r--r--www/rubygem-kaminari-actionview-rails-gitlab/pkg-descr1
-rw-r--r--www/rubygem-kaminari-activerecord-rails-gitlab/Makefile21
-rw-r--r--www/rubygem-kaminari-activerecord-rails-gitlab/distinfo3
-rw-r--r--www/rubygem-kaminari-activerecord-rails-gitlab/pkg-descr1
-rw-r--r--www/rubygem-kaminari-rails-gitlab/Makefile25
-rw-r--r--www/rubygem-kaminari-rails-gitlab/distinfo3
-rw-r--r--www/rubygem-kaminari-rails-gitlab/pkg-descr2
-rw-r--r--www/rubygem-lograge-rails-gitlab/Makefile22
-rw-r--r--www/rubygem-lograge-rails-gitlab/distinfo3
-rw-r--r--www/rubygem-lograge-rails-gitlab/pkg-descr6
-rw-r--r--www/rubygem-rails-gitlab/Makefile49
-rw-r--r--www/rubygem-rails-gitlab/distinfo3
-rw-r--r--www/rubygem-rails-gitlab/pkg-descr23
-rw-r--r--www/rubygem-railties-gitlab/Makefile36
-rw-r--r--www/rubygem-railties-gitlab/distinfo3
-rw-r--r--www/rubygem-railties-gitlab/pkg-descr4
-rw-r--r--www/rubygem-redis-rack-gitlab/Makefile25
-rw-r--r--www/rubygem-redis-rack-gitlab/distinfo3
-rw-r--r--www/rubygem-redis-rack-gitlab/pkg-descr1
-rw-r--r--www/rubygem-responders-rails-gitlab/Makefile21
-rw-r--r--www/rubygem-responders-rails-gitlab/distinfo3
-rw-r--r--www/rubygem-responders-rails-gitlab/pkg-descr1
61 files changed, 656 insertions, 196 deletions
diff --git a/www/Makefile b/www/Makefile
index 8fa719f781ca..16d9e68fa6ef 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2010,6 +2010,7 @@
SUBDIR += rt44
SUBDIR += rt50
SUBDIR += rubygem-ace-rails-ap
+ SUBDIR += rubygem-actioncable-gitlab
SUBDIR += rubygem-actioncable5
SUBDIR += rubygem-actioncable50
SUBDIR += rubygem-actioncable52
@@ -2019,6 +2020,7 @@
SUBDIR += rubygem-actioncable71
SUBDIR += rubygem-actioncable72
SUBDIR += rubygem-actioncable80
+ SUBDIR += rubygem-actionpack-gitlab
SUBDIR += rubygem-actionpack4
SUBDIR += rubygem-actionpack5
SUBDIR += rubygem-actionpack50
@@ -2074,6 +2076,7 @@
SUBDIR += rubygem-crass
SUBDIR += rubygem-cssbundling-rails
SUBDIR += rubygem-cssbundling-rails-gitlab
+ SUBDIR += rubygem-cssbundling-rails-rails-gitlab
SUBDIR += rubygem-cssbundling-rails-rails70
SUBDIR += rubygem-cssbundling-rails-rails71
SUBDIR += rubygem-cssbundling-rails-rails72
@@ -2139,6 +2142,7 @@
SUBDIR += rubygem-gollum-grit_adapter
SUBDIR += rubygem-gollum-lib
SUBDIR += rubygem-gollum-rugged_adapter
+ SUBDIR += rubygem-gon-rails-gitlab
SUBDIR += rubygem-gon-rails5
SUBDIR += rubygem-gon-rails50
SUBDIR += rubygem-gon-rails60
@@ -2205,6 +2209,7 @@
SUBDIR += rubygem-kamal
SUBDIR += rubygem-kaminari
SUBDIR += rubygem-kaminari-actionview
+ SUBDIR += rubygem-kaminari-actionview-rails-gitlab
SUBDIR += rubygem-kaminari-actionview-rails5
SUBDIR += rubygem-kaminari-actionview-rails50
SUBDIR += rubygem-kaminari-actionview-rails52
@@ -2212,6 +2217,7 @@
SUBDIR += rubygem-kaminari-actionview-rails61
SUBDIR += rubygem-kaminari-actionview-rails70
SUBDIR += rubygem-kaminari-activerecord
+ SUBDIR += rubygem-kaminari-activerecord-rails-gitlab
SUBDIR += rubygem-kaminari-activerecord-rails5
SUBDIR += rubygem-kaminari-activerecord-rails50
SUBDIR += rubygem-kaminari-activerecord-rails52
@@ -2219,6 +2225,7 @@
SUBDIR += rubygem-kaminari-activerecord-rails61
SUBDIR += rubygem-kaminari-activerecord-rails70
SUBDIR += rubygem-kaminari-core
+ SUBDIR += rubygem-kaminari-rails-gitlab
SUBDIR += rubygem-kaminari-rails4
SUBDIR += rubygem-kaminari-rails5
SUBDIR += rubygem-kaminari-rails50
@@ -2234,6 +2241,7 @@
SUBDIR += rubygem-llhttp
SUBDIR += rubygem-llhttp-ffi
SUBDIR += rubygem-lograge
+ SUBDIR += rubygem-lograge-rails-gitlab
SUBDIR += rubygem-lograge-rails5
SUBDIR += rubygem-lograge-rails52
SUBDIR += rubygem-lograge-rails60
@@ -2308,6 +2316,7 @@
SUBDIR += rubygem-rackup
SUBDIR += rubygem-rackup10
SUBDIR += rubygem-rackup21
+ SUBDIR += rubygem-rails-gitlab
SUBDIR += rubygem-rails-settings-cached
SUBDIR += rubygem-rails-settings-cached-rails5
SUBDIR += rubygem-rails-settings-cached-rails50
@@ -2325,6 +2334,7 @@
SUBDIR += rubygem-rails_autolink
SUBDIR += rubygem-rails_serve_static_assets
SUBDIR += rubygem-rails_stdout_logging
+ SUBDIR += rubygem-railties-gitlab
SUBDIR += rubygem-railties4
SUBDIR += rubygem-railties5
SUBDIR += rubygem-railties50
@@ -2344,6 +2354,7 @@
SUBDIR += rubygem-rdf-normalize
SUBDIR += rubygem-redcloth
SUBDIR += rubygem-redis-rack
+ SUBDIR += rubygem-redis-rack-gitlab
SUBDIR += rubygem-redis-rack2
SUBDIR += rubygem-redis-rails
SUBDIR += rubygem-redis-rails-rails5
@@ -2352,6 +2363,7 @@
SUBDIR += rubygem-redis-rails-rails60
SUBDIR += rubygem-redis-rails-rails61
SUBDIR += rubygem-responders
+ SUBDIR += rubygem-responders-rails-gitlab
SUBDIR += rubygem-responders-rails5
SUBDIR += rubygem-responders-rails52
SUBDIR += rubygem-responders-rails60
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 87e8fbb2bb31..289de8e04671 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -1,5 +1,5 @@
PORTNAME= firefox
-DISTVERSION= 128.10.0
+DISTVERSION= 128.10.1
PORTEPOCH= 1
CATEGORIES= www wayland
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index f00cbf005dc9..2be2aab5a0a9 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745263534
-SHA256 (firefox-128.10.0esr.source.tar.xz) = 2ed83e26e41a8b3e2c7c0d13448a84dbb9b7ed65ed46bc162d629b0c6b071caf
-SIZE (firefox-128.10.0esr.source.tar.xz) = 556644356
+TIMESTAMP = 1747578844
+SHA256 (firefox-128.10.1esr.source.tar.xz) = e85b25dea98bfa400940e0f79aa82a190b445d848b00d19f801a647598fda0b9
+SIZE (firefox-128.10.1esr.source.tar.xz) = 568752664
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index 053a191e267d..6f87e2d492e8 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1746703453
-SHA256 (go/www_gitlab-pages/gitlab-pages-v17.11.2/go.mod) = b83da7e72c96e7faf9b45df5ea511c394c921e0a377adec8673636f904354f99
-SIZE (go/www_gitlab-pages/gitlab-pages-v17.11.2/go.mod) = 3435
-SHA256 (go/www_gitlab-pages/gitlab-pages-v17.11.2/gitlab-pages-v17.11.2.tar.bz2) = a6d2e709921db3e1e68cab33e90c6e8ae161bf6cdaa13cf2772a0a15db2636f4
-SIZE (go/www_gitlab-pages/gitlab-pages-v17.11.2/gitlab-pages-v17.11.2.tar.bz2) = 233507
+TIMESTAMP = 1747297293
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.0.0/go.mod) = 5d3bf245e8a23b85bf8d20e164da233946fce66407fc882c9eef3146a36bb266
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.0.0/go.mod) = 3435
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.0.0/gitlab-pages-v18.0.0.tar.bz2) = ec76aac2b7b3c3bd915eac21156f50e36ecc214f51caf9c125c69567227eab5a
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.0.0/gitlab-pages-v18.0.0.tar.bz2) = 234324
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 0c0f519aee02..ce8234510990 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1746703509
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.11.2/go.mod) = 4fea0d1f76f8078f7dc8f7b3350f05e288764e289460476fdddbc9d0d5e1bdb5
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.11.2/go.mod) = 9201
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.11.2/gitlab-foss-v17.11.2.tar.bz2) = cca1c17742e83a3449b262980ce6522c713eeb9f50dcba4bb831d4e3b32b8ca6
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.11.2/gitlab-foss-v17.11.2.tar.bz2) = 127999225
+TIMESTAMP = 1747297312
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.0.0/go.mod) = 8dbcbe08dbde6db18015e8e2cd84a67a5da908501eb5d6c6d7111fe2e63d27c6
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.0.0/go.mod) = 9144
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.0.0/gitlab-foss-v18.0.0.tar.bz2) = 17e3c1df51b242b74ebd45ccb5ba8e0d3ca63dc63db16084d586a9dd36d79b05
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.0.0/gitlab-foss-v18.0.0.tar.bz2) = 116971580
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 061574162fe2..8e5a9710dc85 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -27,8 +27,9 @@ 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 \
@@ -41,17 +42,17 @@ 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-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-responders-rails-gitlab>=3.0<4.0:www/rubygem-responders-rails-gitlab \
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-sprockets-rails-rails-gitlab>=3.5.2<3.6:devel/rubygem-sprockets-rails-rails-gitlab \
+ rubygem-view_component-rails-gitlab>=3.21.0<3.22: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 \
@@ -59,10 +60,10 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-logger-gitlab>=1.6.0<1.7: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,7 +86,7 @@ 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 \
@@ -105,10 +106,12 @@ 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-mini_magick4>=4.12<5:graphics/rubygem-mini_magick4 \
+ rubygem-prawn>=0:print/rubygem-prawn \
+ rubygem-prawn-svg>=0:print/rubygem-prawn-svg \
rubygem-fog-aws328>=3.26<4:net/rubygem-fog-aws328 \
rubygem-fog-core210>=2.1.0<2.1.1:devel/rubygem-fog-core210 \
rubygem-fog-google-gitlab>=1.24.1<1.25:net/rubygem-fog-google-gitlab \
@@ -134,9 +137,9 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
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-core-gitlab>=3.223.0<3.224: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-s3-gitlab>=1.185.0<1.186: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 \
@@ -156,7 +159,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-rouge-gitlab>=4.5.1<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.30<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 \
@@ -167,20 +170,20 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
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-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-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-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-redis-actionpack-rails-gitlab>=5.5.0<5.6:databases/rubygem-redis-actionpack-rails-gitlab \
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-atlassian-jwt>=0.2.1<0.3.0:www/rubygem-atlassian-jwt \
@@ -199,29 +202,29 @@ 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-webrick>=1.9.0<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-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 \
@@ -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.0<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 \
@@ -263,7 +266,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
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-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 \
@@ -275,13 +278,13 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-google-protobuf3>=3.25.6<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-lograge-rails-gitlab>=0.11.2<1.0:www/rubygem-lograge-rails-gitlab \
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-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,7 +292,7 @@ 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-gitlab>=2.10.2<2.11:devel/rubygem-json-gitlab \
+ rubygem-json>=2.11.2<2.12:devel/rubygem-json \
rubygem-json_schemer>=2.3.0<2.4:devel/rubygem-json_schemer \
rubygem-oj>=3.16.0<3.17:devel/rubygem-oj \
rubygem-oj-introspect>=0.8<1:devel/rubygem-oj-introspect \
@@ -298,10 +301,10 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
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,9 +314,9 @@ 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.11<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-google-cloud-storage_transfer-gitlab>=1.2.0<1.3:net/rubygem-google-cloud-storage_transfer-gitlab \
@@ -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 97c84df1048b..9e0f66298ff7 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,5 +1,5 @@
-GITLAB_VERSION= 17.11.2
-GITLAB_PORTREVISION= 1
+GITLAB_VERSION= 18.0.0
+GITLAB_PORTREVISION= 0
# Git version gitaly should use (from gitlab mirror)
# Find current tag from Makefile and .gitlab-ci.yaml
@@ -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..3c1c169ae9a0 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 = 1747397695
+SHA256 (gitlab-foss-v18.0.0.tar.bz2) = 17e3c1df51b242b74ebd45ccb5ba8e0d3ca63dc63db16084d586a9dd36d79b05
+SIZE (gitlab-foss-v18.0.0.tar.bz2) = 116971580
+TIMESTAMP = 1747397696
+SHA256 (gitlab-v18.0.0-ee.tar.bz2) = 190b986c8b73f4252bf0750536577251019102d35493236feec4e8dc19865ef6
+SIZE (gitlab-v18.0.0-ee.tar.bz2) = 131774611
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 408e873e25c9..fff952d72391 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-05-14 17:45:50 UTC
+++ Gemfile
-@@ -168,8 +168,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea
+@@ -160,8 +160,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
@@ -11,7 +11,7 @@
gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
# Cells
-@@ -220,7 +220,7 @@ gem 'google-cloud-storage', '~> 1.45.0', feature_categ
+@@ -216,7 +216,7 @@ gem 'google-cloud-storage', '~> 1.45.0', feature_categ
gem 'google-apis-storage_v1', '~> 0.29', feature_category: :shared
gem 'google-cloud-storage', '~> 1.45.0', feature_category: :shared
# We need >= 0.11.1 because that's when match_glob support is added to list_objects
@@ -20,7 +20,7 @@
gem 'google-apis-compute_v1', '~> 0.57.0', feature_category: :shared
gem 'google-apis-container_v1', '~> 0.43.0', feature_category: :shared
gem 'google-apis-container_v1beta1', '~> 0.43.0', feature_category: :shared
-@@ -231,7 +231,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0', fe
+@@ -227,7 +227,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0', fe
gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared
gem 'google-apis-androidpublisher_v3', '~> 0.34.0', feature_category: :shared
@@ -29,7 +29,7 @@
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
+@@ -283,7 +283,7 @@ group :puma do
gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared
group :puma do
@@ -38,7 +38,7 @@
gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared
end
-@@ -295,7 +295,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature
+@@ -291,7 +291,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature
gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared
# Background jobs
@@ -47,23 +47,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
+@@ -471,143 +471,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 +83,9 @@
-end
-
-group :development, :test do
-- gem 'deprecation_toolkit', '~> 1.5.1', require: false, feature_category: :shared
+- gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared
- gem 'bullet', '~> 7.2.0', feature_category: :shared
-- gem 'parser', '= 3.3.7.1', 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
@@ -120,7 +113,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', '~> 0.7.2', 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 +137,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,17 +180,18 @@
- 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
+@@ -642,16 +514,16 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside
gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
# Gitaly GRPC protocol definitions
@@ -205,8 +199,8 @@
+gem 'gitaly', '~> 17.8', 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
+-gem 'gitlab-kas-grpc', '~> 17.11.0', feature_category: :deployment_management
++gem 'gitlab-kas-grpc', '~> 18.0', feature_category: :deployment_management
# Lock the version before issues below are resolved:
# https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939
@@ -217,8 +211,8 @@
gem 'google-protobuf', '~> 3.25', '>= 3.25.3', 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
+@@ -672,7 +544,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 +220,7 @@
gem 'retriable', '~> 3.1.2', feature_category: :shared
-@@ -754,10 +629,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
+@@ -753,10 +625,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
gem 'duo_api', '~> 1.3', feature_category: :system_access
@@ -237,9 +231,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.11", 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..3ace91d53c65 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-05-14 17:45:50 UTC
+++ config/gitlab.yml.example
-@@ -484,7 +484,7 @@ production: &base
+@@ -489,7 +489,7 @@ production: &base
## GitLab Pages
pages:
enabled: false
@@ -9,7 +9,7 @@
# The location where pages are stored (default: shared/pages).
# path: shared/pages
-@@ -494,9 +494,9 @@ production: &base
+@@ -499,9 +499,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
@@ -22,7 +22,7 @@
# 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
+@@ -1233,13 +1233,13 @@ production: &base
repositories:
storages: # You must have at least a `default` storage path.
default:
@@ -38,7 +38,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
+@@ -1274,12 +1274,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -54,7 +54,7 @@
# Git over HTTP
upload_pack: true
-@@ -1288,7 +1288,7 @@ production: &base
+@@ -1294,7 +1294,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 +63,7 @@
cell:
# enabled: false
-@@ -1306,7 +1306,7 @@ production: &base
+@@ -1312,7 +1312,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 +72,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
+@@ -1339,13 +1339,13 @@ production: &base
## GitLab Elasticsearch settings
elasticsearch:
@@ -88,7 +88,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
+@@ -1366,18 +1366,18 @@ production: &base
# Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq.
sidekiq_exporter:
@@ -114,7 +114,7 @@
# Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma.
web_exporter:
-@@ -1598,13 +1598,13 @@ test:
+@@ -1604,13 +1604,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..9844d39df8d4 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,15 +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-05-14 17:45:50 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|
+@@ -40,11 +40,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"
diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message
index 6428be5f3115..59992ca06610 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.0-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/17.11-18.0-freebsd.md
If you just installed an minor upgrade of GitLab please follow
the instructions in the guide at:
diff --git a/www/homer-web/Makefile b/www/homer-web/Makefile
index 24b0cf1031e0..aa1cb6536dc9 100644
--- a/www/homer-web/Makefile
+++ b/www/homer-web/Makefile
@@ -1,6 +1,6 @@
PORTNAME= homer
DISTVERSIONPREFIX= v
-DISTVERSION= 25.05.1
+DISTVERSION= 25.05.2
CATEGORIES= www
MASTER_SITES= https://github.com/bastienwirtz/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
PKGNAMESUFFIX= -web
diff --git a/www/homer-web/distinfo b/www/homer-web/distinfo
index 2beb55f9b52a..085dbc6db5eb 100644
--- a/www/homer-web/distinfo
+++ b/www/homer-web/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746467397
-SHA256 (homer-25.05.1/homer.zip) = dc6cec598c7c33008ea66c6a424317190d2a2aba3a54dc2f512e4dba2f088e92
-SIZE (homer-25.05.1/homer.zip) = 1135408
+TIMESTAMP = 1747630986
+SHA256 (homer-25.05.2/homer.zip) = e6b98feced71787642be3e1bbbee5dbc41e2a580228baad88fe7246a9ada3f1d
+SIZE (homer-25.05.2/homer.zip) = 1134626
diff --git a/www/homer-web/pkg-plist b/www/homer-web/pkg-plist
index b1e81603448d..7ac5b5cc0b39 100644
--- a/www/homer-web/pkg-plist
+++ b/www/homer-web/pkg-plist
@@ -19,99 +19,99 @@
%%WWWDIR%%/index.html
%%WWWDIR%%/logo.png
%%WWWDIR%%/registerSW.js
-%%WWWDIR%%/resources/AdGuardHome-BfFM9H2A.js
+%%WWWDIR%%/resources/AdGuardHome-Cu_6JEdC.js
%%WWWDIR%%/resources/AdGuardHome-Tw0vCF6f.css
-%%WWWDIR%%/resources/CopyToClipboard-CjlqRd3R.js
%%WWWDIR%%/resources/CopyToClipboard-DUc_NqZL.css
-%%WWWDIR%%/resources/DockerSocketProxy-CtBSfVQ4.js
-%%WWWDIR%%/resources/DockerSocketProxy-x5542i92.css
+%%WWWDIR%%/resources/CopyToClipboard-DnEhRlbV.js
+%%WWWDIR%%/resources/DockerSocketProxy-1behWyyp.js
+%%WWWDIR%%/resources/DockerSocketProxy-DYHxpllM.css
+%%WWWDIR%%/resources/Docuseal-CS2PfU1J.js
%%WWWDIR%%/resources/Docuseal-GTRlXpFw.css
-%%WWWDIR%%/resources/Docuseal-yh1Bp7eU.js
+%%WWWDIR%%/resources/Emby-BjICRaP_.js
%%WWWDIR%%/resources/Emby-Cc4XwFHX.css
-%%WWWDIR%%/resources/Emby-CvTs9TNE.js
-%%WWWDIR%%/resources/FreshRSS-BdJMV5mk.css
-%%WWWDIR%%/resources/FreshRSS-BtwguxfM.js
-%%WWWDIR%%/resources/Gitea-BjQsojkJ.js
+%%WWWDIR%%/resources/FreshRSS-B2oAXOny.js
+%%WWWDIR%%/resources/FreshRSS-D6eQ8Kbw.css
%%WWWDIR%%/resources/Gitea-DJOaXsSb.css
-%%WWWDIR%%/resources/Glances-D-J3iX4l.js
+%%WWWDIR%%/resources/Gitea-RRIgDn7w.js
+%%WWWDIR%%/resources/Glances-Chku44Px.js
+%%WWWDIR%%/resources/Gotify-BgzkB-3Y.js
%%WWWDIR%%/resources/Gotify-CgkfqLBJ.css
-%%WWWDIR%%/resources/Gotify-yj4dQwQn.js
-%%WWWDIR%%/resources/Healthchecks-CG-ysnp9.js
+%%WWWDIR%%/resources/Healthchecks-AObEB_xO.js
%%WWWDIR%%/resources/Healthchecks-CuXYh2ap.css
-%%WWWDIR%%/resources/HomeAssistant-4k1cqTqL.js
%%WWWDIR%%/resources/HomeAssistant-D4G66XLG.css
+%%WWWDIR%%/resources/HomeAssistant-DrPLsZar.js
%%WWWDIR%%/resources/Immich-BQJ4xb-9.css
-%%WWWDIR%%/resources/Immich-Dpmapxbu.js
-%%WWWDIR%%/resources/Jellystat-CRlyhbsa.js
+%%WWWDIR%%/resources/Immich-DlmpD0mC.js
+%%WWWDIR%%/resources/Jellystat-CbiCXDql.js
%%WWWDIR%%/resources/Jellystat-YCL3xwF6.css
-%%WWWDIR%%/resources/Lidarr-D1KR85PC.js
+%%WWWDIR%%/resources/Lidarr-CLcf-XQ6.js
%%WWWDIR%%/resources/Lidarr-Dza-1-vv.css
-%%WWWDIR%%/resources/Linkding-Fa1evqHd.js
-%%WWWDIR%%/resources/Matrix-CTCYXHVe.js
+%%WWWDIR%%/resources/Linkding-Bcj9DoPV.js
+%%WWWDIR%%/resources/Matrix-Hzvly6x7.js
%%WWWDIR%%/resources/Matrix-Q-bxbOqk.css
-%%WWWDIR%%/resources/Mealie-chMEgEVI.js
+%%WWWDIR%%/resources/Mealie-CLBYZtEP.js
+%%WWWDIR%%/resources/Medusa-DYHhrgNG.js
%%WWWDIR%%/resources/Medusa-DcXIgM3A.css
-%%WWWDIR%%/resources/Medusa-G2vEvJaZ.js
-%%WWWDIR%%/resources/Mylar-Bk6mFch6.js
%%WWWDIR%%/resources/Mylar-D14wGFq4.css
-%%WWWDIR%%/resources/Nextcloud-BkTg4YmH.js
+%%WWWDIR%%/resources/Mylar-GRac72Bx.js
+%%WWWDIR%%/resources/Nextcloud-BNQ1Lusd.js
%%WWWDIR%%/resources/Nextcloud-v71Ld_Cv.css
-%%WWWDIR%%/resources/OctoPrint-B1Yz07FH.js
+%%WWWDIR%%/resources/OctoPrint-CZYpZFzI.js
%%WWWDIR%%/resources/OctoPrint-DqTJwI-L.css
-%%WWWDIR%%/resources/Olivetin-CMt84iMk.js
+%%WWWDIR%%/resources/Olivetin-BGNKkrOb.js
%%WWWDIR%%/resources/Olivetin-D8ESXpq5.css
+%%WWWDIR%%/resources/OpenHAB-3FFnMtMR.js
%%WWWDIR%%/resources/OpenHAB-BjwTZqa0.css
-%%WWWDIR%%/resources/OpenHAB-DqO798QH.js
-%%WWWDIR%%/resources/OpenWeather-BKPkxLGY.css
-%%WWWDIR%%/resources/OpenWeather-UWsD3Ken.js
-%%WWWDIR%%/resources/PaperlessNG-Dr2jVcHs.js
-%%WWWDIR%%/resources/PeaNUT-C28MUCr8.js
+%%WWWDIR%%/resources/OpenWeather-BabLKX1b.js
+%%WWWDIR%%/resources/OpenWeather-CGFhy5zp.css
+%%WWWDIR%%/resources/PaperlessNG-oWfRjp9q.js
+%%WWWDIR%%/resources/PeaNUT-BgH2df17.js
%%WWWDIR%%/resources/PiAlert-27f4aoYp.css
-%%WWWDIR%%/resources/PiAlert-DmtXo46V.js
-%%WWWDIR%%/resources/PiHole-3sFywXPg.css
-%%WWWDIR%%/resources/PiHole-CewW1sJ8.js
+%%WWWDIR%%/resources/PiAlert-DQIOdNw5.js
+%%WWWDIR%%/resources/PiHole-B590p74K.css
+%%WWWDIR%%/resources/PiHole-CYpoxC7G.js
%%WWWDIR%%/resources/Ping-BVyk1tW9.css
-%%WWWDIR%%/resources/Ping-CDn56lAz.js
-%%WWWDIR%%/resources/Plex-CtqAc55C.css
-%%WWWDIR%%/resources/Plex-U4yR0ZN3.js
+%%WWWDIR%%/resources/Ping-fi6Ns6kR.js
+%%WWWDIR%%/resources/Plex-CYMU8-Xj.js
+%%WWWDIR%%/resources/Plex-D9cFNqvv.css
%%WWWDIR%%/resources/Portainer-BQaRgpcO.css
-%%WWWDIR%%/resources/Portainer-BrAttM5X.js
-%%WWWDIR%%/resources/Prometheus-BvsyBoCa.js
+%%WWWDIR%%/resources/Portainer-CIbatA6O.js
+%%WWWDIR%%/resources/Prometheus-BpnOLe8b.js
%%WWWDIR%%/resources/Prometheus-DW7rR0zJ.css
%%WWWDIR%%/resources/Prowlarr-C0MntQnn.css
-%%WWWDIR%%/resources/Prowlarr-D0o-_4lR.js
+%%WWWDIR%%/resources/Prowlarr-DxxcG7yf.js
%%WWWDIR%%/resources/Proxmox-B7Ne6yNU.css
-%%WWWDIR%%/resources/Proxmox-CXr0bID6.js
-%%WWWDIR%%/resources/Radarr-DGpUY4mN.js
+%%WWWDIR%%/resources/Proxmox-BdtgVaPM.js
+%%WWWDIR%%/resources/Radarr-CGR3qyQt.js
%%WWWDIR%%/resources/Radarr-Drh5L8HP.css
-%%WWWDIR%%/resources/Readarr-DtScEyIt.js
+%%WWWDIR%%/resources/Readarr-D-hglqIL.js
%%WWWDIR%%/resources/Readarr-QGnLos4n.css
%%WWWDIR%%/resources/Rtorrent-8y0Hk3ah.css
-%%WWWDIR%%/resources/Rtorrent-CVI1EAT2.js
-%%WWWDIR%%/resources/SABnzbd-Bq1E7sfL.js
-%%WWWDIR%%/resources/SABnzbd-C7_KSBXO.css
+%%WWWDIR%%/resources/Rtorrent-Br5Zwikh.js
+%%WWWDIR%%/resources/SABnzbd-8iUmv5zX.js
+%%WWWDIR%%/resources/SABnzbd-Doh_UVaM.css
%%WWWDIR%%/resources/Scrutiny-BFyhoSmH.css
-%%WWWDIR%%/resources/Scrutiny-N52Py8RU.js
+%%WWWDIR%%/resources/Scrutiny-NK54uZOt.js
%%WWWDIR%%/resources/Sonarr-B0qW27KC.css
-%%WWWDIR%%/resources/Sonarr-CF-5Hk9N.js
-%%WWWDIR%%/resources/SpeedtestTracker-CYrwstzE.js
+%%WWWDIR%%/resources/Sonarr-CutaVloJ.js
+%%WWWDIR%%/resources/SpeedtestTracker-WmpXDxlz.js
+%%WWWDIR%%/resources/Tautulli-B81_2SB0.js
%%WWWDIR%%/resources/Tautulli-CfeJITWv.css
-%%WWWDIR%%/resources/Tautulli-CmYOkCJF.js
%%WWWDIR%%/resources/Tdarr-BvRK51o8.css
-%%WWWDIR%%/resources/Tdarr-ZSMoTlRe.js
+%%WWWDIR%%/resources/Tdarr-DcPzSkDN.js
%%WWWDIR%%/resources/ThemeChooser-CcNjZIAP.css
-%%WWWDIR%%/resources/ThemeChooser-UvSE6ows.js
-%%WWWDIR%%/resources/Traefik-CFx7BitS.js
+%%WWWDIR%%/resources/ThemeChooser-KKiR7zA_.js
+%%WWWDIR%%/resources/Traefik-BwTNK5Rs.js
%%WWWDIR%%/resources/Traefik-QfL0WZ4b.css
-%%WWWDIR%%/resources/TruenasScale-Dlh3PNum.js
+%%WWWDIR%%/resources/TruenasScale-BnAlcXxz.js
%%WWWDIR%%/resources/TruenasScale-maMPkiom.css
-%%WWWDIR%%/resources/UptimeKuma-CcWwR8ZM.js
+%%WWWDIR%%/resources/UptimeKuma-BFp0iigK.js
%%WWWDIR%%/resources/UptimeKuma-Fq8eQnsp.css
-%%WWWDIR%%/resources/Vaultwarden-DTS3MIuR.js
+%%WWWDIR%%/resources/Vaultwarden-CH7Xt_PN.js
%%WWWDIR%%/resources/Vaultwarden-Dy-eliI8.css
%%WWWDIR%%/resources/WUD-BLIHvfpt.css
-%%WWWDIR%%/resources/WUD-dvk-H_mn.js
-%%WWWDIR%%/resources/Wallabag-BgScaCez.js
+%%WWWDIR%%/resources/WUD-BQz1SsPh.js
+%%WWWDIR%%/resources/Wallabag-CD96f6ec.js
%%WWWDIR%%/resources/Wallabag-VA4tCsKR.css
%%WWWDIR%%/resources/fa-brands-400-D1LuMI3I.ttf
%%WWWDIR%%/resources/fa-brands-400-D_cYUPeE.woff2
@@ -121,11 +121,10 @@
%%WWWDIR%%/resources/fa-solid-900-D0aA9rwL.ttf
%%WWWDIR%%/resources/fa-v4compatibility-C9RhG_FT.woff2
%%WWWDIR%%/resources/fa-v4compatibility-CCth-dXg.ttf
-%%WWWDIR%%/resources/index-CszYxh3i.css
-%%WWWDIR%%/resources/index-D-u-9ayF.js
+%%WWWDIR%%/resources/index-CgyetKj3.css
+%%WWWDIR%%/resources/index-NXnxvJjD.js
%%WWWDIR%%/resources/noto-latin-normal-GUnxZaaT.woff2
+%%WWWDIR%%/resources/qBittorrent-B6NJkixf.js
%%WWWDIR%%/resources/qBittorrent-B7KcPLhg.css
-%%WWWDIR%%/resources/qBittorrent-DVukxuYf.js
-%%WWWDIR%%/resources/service-BGjJGoFF.js
%%WWWDIR%%/sw.js
%%WWWDIR%%/workbox-84c915bb.js
diff --git a/www/librewolf/Makefile b/www/librewolf/Makefile
index 15e83127c5e4..e4f0bb300adb 100644
--- a/www/librewolf/Makefile
+++ b/www/librewolf/Makefile
@@ -1,5 +1,5 @@
PORTNAME= librewolf
-DISTVERSION= 138.0.3
+DISTVERSION= 138.0.4
LWPATCH= -1
DISTVERSIONSUFFIX= ${LWPATCH}.source
CATEGORIES= www wayland
diff --git a/www/librewolf/distinfo b/www/librewolf/distinfo
index 5848fa1442f7..f9f8c30042a3 100644
--- a/www/librewolf/distinfo
+++ b/www/librewolf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1747328459
-SHA256 (librewolf-138.0.3-1.source.tar.gz) = 0a849bb4cb4448004451f1af87c12a951d782048e8668b9b6754246089c45dcb
-SIZE (librewolf-138.0.3-1.source.tar.gz) = 1019083591
+TIMESTAMP = 1747577982
+SHA256 (librewolf-138.0.4-1.source.tar.gz) = b63081971871154cf115ef3f237e865c2c1358c7086c3ff71c21918d4f343e9f
+SIZE (librewolf-138.0.4-1.source.tar.gz) = 1018411007
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 3ad175d68cd2..0bc9b585b4ab 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME?= nginx
PORTVERSION= 1.28.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 248598e06b69..7011ee65f3f5 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -143,10 +143,8 @@ HTTP_PUSH_VARS= DSO_EXTMODS+=push
HTTP_PUSH_STREAM_GH_TUPLE= wandenberg:nginx-push-stream-module:0.6.0:pushstream
HTTP_PUSH_STREAM_VARS= DSO_EXTMODS+=pushstream
-HTTP_REDIS_MASTER_SITES= LOCAL/osa:redis
-HTTP_REDIS_DISTFILES= ngx_http_redis-0.3.9.tar.gz:redis
-HTTP_REDIS_VARS= DSO_EXTDIRS+=ngx_http_redis-0.3.9
-HTTP_REDIS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_redis_module.c
+HTTP_REDIS_GH_TUPLE= osokin:ngx_http_redis:ad7d90c:redis
+HTTP_REDIS_VARS= DSO_EXTMODS+=redis
HTTP_SLICE_AHEAD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_http_modules_ngx_http_slice_read_ahead.c
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 29cbdd4b1f6d..558ce00747a7 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,10 +1,10 @@
-TIMESTAMP = 1746537167
+TIMESTAMP = 1747580329
SHA256 (nginx-1.28.0.tar.gz) = c6b5c6b086c0df9d3ca3ff5e084c1d0ef909e6038279c71c1c3e985f576ff76a
SIZE (nginx-1.28.0.tar.gz) = 1280111
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208
-SHA256 (ngx_http_redis-0.3.9.tar.gz) = 21f87540f0a44b23ffa5df16fb3d788bc90803b255ef14f9c26e3847a6f26f46
-SIZE (ngx_http_redis-0.3.9.tar.gz) = 13051
+SHA256 (osokin-ngx_http_redis-ad7d90c_GH0.tar.gz) = 3ac409accbfdc2da2288a37eba8e918b63cad460dab6b29e9f3e7b9823dca744
+SIZE (osokin-ngx_http_redis-ad7d90c_GH0.tar.gz) = 12724
SHA256 (passenger-6.0.27.tar.gz) = 82c830aee98feece09e84309c2d0c6bb3f7b22a3c8e33cfe93b5e0d498615d0f
SIZE (passenger-6.0.27.tar.gz) = 7548637
SHA256 (msva-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 522e94c59f5783f281d868ede2adf325bf2f8ffb9e62cf8451d4b9ac0516916c
diff --git a/www/py-httpx-retries/Makefile b/www/py-httpx-retries/Makefile
index 7a76411077d8..a06943fcc8e0 100644
--- a/www/py-httpx-retries/Makefile
+++ b/www/py-httpx-retries/Makefile
@@ -1,5 +1,5 @@
PORTNAME= httpx-retries
-PORTVERSION= 0.3.2
+DISTVERSION= 0.4.0
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-httpx-retries/distinfo b/www/py-httpx-retries/distinfo
index 8252ea8abcbe..4ef455958702 100644
--- a/www/py-httpx-retries/distinfo
+++ b/www/py-httpx-retries/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745649955
-SHA256 (httpx_retries-0.3.2.tar.gz) = af2cc82f18e9196612e3c73aba027982450b6581f565af659dd8f5c884e991e0
-SIZE (httpx_retries-0.3.2.tar.gz) = 12530
+TIMESTAMP = 1747637137
+SHA256 (httpx_retries-0.4.0.tar.gz) = a7aa513e3f1eef347aac69adecfad9f421210a84df88c88f935ec130f98e6642
+SIZE (httpx_retries-0.4.0.tar.gz) = 12571
diff --git a/www/rubygem-actioncable-gitlab/Makefile b/www/rubygem-actioncable-gitlab/Makefile
new file mode 100644
index 000000000000..a6870b1ba8c0
--- /dev/null
+++ b/www/rubygem-actioncable-gitlab/Makefile
@@ -0,0 +1,28 @@
+PORTNAME= actioncable
+PORTVERSION= ${RAILS_VERSION}
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Structure many real-time application concerns into channels over a single WebSocket connection
+WWW= https://github.com/rails/rails/tree/main/actioncable \
+ https://rubyonrails.org/
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-actionpack-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actionpack-gitlab \
+ rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \
+ rubygem-nio4r>=2.0<3:devel/rubygem-nio4r \
+ rubygem-websocket-driver>=0.6.1:www/rubygem-websocket-driver \
+ rubygem-zeitwerk>=2.6<3:devel/rubygem-zeitwerk
+
+USES= gem
+
+NO_ARCH= yes
+
+PORTSCOUT= limit:^7\.1\.
+
+.include "${.CURDIR}/../../www/gitlab/Makefile.common"
+.include <bsd.port.mk>
diff --git a/www/rubygem-actioncable-gitlab/distinfo b/www/rubygem-actioncable-gitlab/distinfo
new file mode 100644
index 000000000000..3d467b025814
--- /dev/null
+++ b/www/rubygem-actioncable-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1734888822
+SHA256 (rubygem/actioncable-7.1.5.1.gem) = 764637b5b2d97b94e412d562c177bfd16b0fd769d55c98846362f5263e8aaa0d
+SIZE (rubygem/actioncable-7.1.5.1.gem) = 48128
diff --git a/www/rubygem-actioncable-gitlab/pkg-descr b/www/rubygem-actioncable-gitlab/pkg-descr
new file mode 100644
index 000000000000..5d7feb3ca8cf
--- /dev/null
+++ b/www/rubygem-actioncable-gitlab/pkg-descr
@@ -0,0 +1,7 @@
+Action Cable seamlessly integrates WebSockets with the rest of your Rails
+application. It allows for real-time features to be written in Ruby in the same
+style and form as the rest of your Rails application, while still being
+performant and scalable. It's a full-stack offering that provides both a
+client-side JavaScript framework and a server-side Ruby framework. You have
+access to your full domain model written with Active Record or your ORM of
+choice.
diff --git a/www/rubygem-actionpack-gitlab/Makefile b/www/rubygem-actionpack-gitlab/Makefile
new file mode 100644
index 000000000000..c9a5845999ee
--- /dev/null
+++ b/www/rubygem-actionpack-gitlab/Makefile
@@ -0,0 +1,32 @@
+PORTNAME= actionpack
+PORTVERSION= ${RAILS_VERSION}
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Action Controller and Action View of Rails MVC Framework
+WWW= https://github.com/rails/rails/tree/main/actionpack \
+ https://rubyonrails.org/
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-actionview-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-actionview-gitlab \
+ rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \
+ rubygem-nokogiri>=1.8.5:textproc/rubygem-nokogiri \
+ rubygem-racc>=0:devel/rubygem-racc \
+ rubygem-rack22>=2.2.4,3:www/rubygem-rack22 \
+ rubygem-rack-session10>=1.0.1:www/rubygem-rack-session10 \
+ rubygem-rack-test>=0.6.3:www/rubygem-rack-test \
+ rubygem-rails-dom-testing-rails-gitlab>=2.2<3:textproc/rubygem-rails-dom-testing-rails-gitlab \
+ rubygem-rails-html-sanitizer>=1.6<2:textproc/rubygem-rails-html-sanitizer
+
+USES= gem
+
+NO_ARCH= yes
+
+PORTSCOUT= limit:^7\.1\.
+
+.include "${.CURDIR}/../../www/gitlab/Makefile.common"
+.include <bsd.port.mk>
diff --git a/www/rubygem-actionpack-gitlab/distinfo b/www/rubygem-actionpack-gitlab/distinfo
new file mode 100644
index 000000000000..f78deede4ac7
--- /dev/null
+++ b/www/rubygem-actionpack-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1734888824
+SHA256 (rubygem/actionpack-7.1.5.1.gem) = 2bc263d9f43f16cc3b3360f59659ab11f140577602f371f1a968e2672b38d718
+SIZE (rubygem/actionpack-7.1.5.1.gem) = 246272
diff --git a/www/rubygem-actionpack-gitlab/pkg-descr b/www/rubygem-actionpack-gitlab/pkg-descr
new file mode 100644
index 000000000000..2f8df748c74a
--- /dev/null
+++ b/www/rubygem-actionpack-gitlab/pkg-descr
@@ -0,0 +1,19 @@
+Action Pack is a framework for handling and responding to web requests. It
+provides mechanisms for routing (mapping request URLs to actions), defining
+controllers that implement actions, and generating responses. In short, Action
+Pack provides the controller layer in the MVC paradigm.
+
+It consists of several modules:
+- Action Dispatch, which parses information about the web request, handles
+ routing as defined by the user, and does advanced processing related to HTTP
+ such as MIME-type negotiation, decoding parameters in POST, PATCH, or PUT
+ bodies, handling HTTP caching logic, cookies and sessions.
+- Action Controller, which provides a base controller class that can be
+ subclassed to implement filters and actions to handle requests. The result of
+ an action is typically content generated from views.
+
+With the Ruby on Rails framework, users only directly interface with the Action
+Controller module. Necessary Action Dispatch functionality is activated by
+default and Action View rendering is implicitly triggered by Action Controller.
+However, these modules are designed to function on their own and can be used
+outside of Rails.
diff --git a/www/rubygem-coverband/Makefile b/www/rubygem-coverband/Makefile
index 8fd3618b83c0..2e1e1e7adbc2 100644
--- a/www/rubygem-coverband/Makefile
+++ b/www/rubygem-coverband/Makefile
@@ -1,5 +1,5 @@
PORTNAME= coverband
-PORTVERSION= 6.1.4
+PORTVERSION= 6.1.5
CATEGORIES= www rubygems
MASTER_SITES= RG
@@ -10,7 +10,8 @@ WWW= https://github.com/danmayer/coverband
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= rubygem-redis>=3.0:databases/rubygem-redis
+RUN_DEPENDS= rubygem-base64>=0:converters/rubygem-base64 \
+ rubygem-redis>=3.0:databases/rubygem-redis
USES= gem shebangfix
diff --git a/www/rubygem-coverband/distinfo b/www/rubygem-coverband/distinfo
index 6a23f094326a..4920d2de9087 100644
--- a/www/rubygem-coverband/distinfo
+++ b/www/rubygem-coverband/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1732165897
-SHA256 (rubygem/coverband-6.1.4.gem) = 65cf398e6dd00ea7ec71381dc90bf7636b76799fba1f3f48871d746b350e17c8
-SIZE (rubygem/coverband-6.1.4.gem) = 211456
+TIMESTAMP = 1747309426
+SHA256 (rubygem/coverband-6.1.5.gem) = 45173be9b00f70c1700d5a0d5bde1d553288862741dc5c602c58d3b3fb0f8225
+SIZE (rubygem/coverband-6.1.5.gem) = 212480
diff --git a/www/rubygem-cssbundling-rails-rails-gitlab/Makefile b/www/rubygem-cssbundling-rails-rails-gitlab/Makefile
new file mode 100644
index 000000000000..87c19ec0b992
--- /dev/null
+++ b/www/rubygem-cssbundling-rails-rails-gitlab/Makefile
@@ -0,0 +1,20 @@
+PORTNAME= cssbundling-rails
+PORTVERSION= 1.4.3
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -rails-gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Bundle and process CSS with Tailwind, Bootstrap, PostCSS, Sass in Rails via Node.js
+WWW= https://github.com/rails/cssbundling-rails
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-railties-gitlab>=6.0.0:www/rubygem-railties-gitlab
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-cssbundling-rails-rails-gitlab/distinfo b/www/rubygem-cssbundling-rails-rails-gitlab/distinfo
new file mode 100644
index 000000000000..f2cba7b71cfe
--- /dev/null
+++ b/www/rubygem-cssbundling-rails-rails-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1742070756
+SHA256 (rubygem/cssbundling-rails-1.4.3.gem) = 53aecd5a7d24ac9c8fcd92975acd0e830fead4ee4583d3d3d49bb64651946e41
+SIZE (rubygem/cssbundling-rails-1.4.3.gem) = 11776
diff --git a/www/rubygem-cssbundling-rails-rails-gitlab/pkg-descr b/www/rubygem-cssbundling-rails-rails-gitlab/pkg-descr
new file mode 100644
index 000000000000..3bf0ef49a085
--- /dev/null
+++ b/www/rubygem-cssbundling-rails-rails-gitlab/pkg-descr
@@ -0,0 +1,12 @@
+Use Tailwind CSS, Bootstrap, Bulma, PostCSS, or Dart Sass to bundle and process
+your CSS, then deliver it via the asset pipeline in Rails. This gem provides
+installers to get you going with the bundler of your choice in a new Rails
+application, and a convention to use app/assets/builds to hold your bundled
+output as artifacts that are not checked into source control (the installer adds
+this directory to .gitignore by default).
+
+You develop using this approach by running the bundler in watch mode in a
+terminal with yarn build:css --watch (and your Rails server in another, if
+you're not using something like puma-dev). You can also use ./bin/dev, which
+will start both the Rails server and the CSS build watcher (along with a JS
+build watcher, if you're also using jsbundling-rails).
diff --git a/www/rubygem-gon-rails-gitlab/Makefile b/www/rubygem-gon-rails-gitlab/Makefile
new file mode 100644
index 000000000000..d233ce4c6716
--- /dev/null
+++ b/www/rubygem-gon-rails-gitlab/Makefile
@@ -0,0 +1,24 @@
+PORTNAME= gon
+PORTVERSION= 6.4.0
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -rails-gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Framework to pass data to JS easily
+WWW= https://github.com/gazay/gon
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+RUN_DEPENDS= rubygem-actionpack-gitlab>=3.0.20:www/rubygem-actionpack-gitlab \
+ rubygem-i18n>=0.7:devel/rubygem-i18n \
+ rubygem-multi_json>=0:devel/rubygem-multi_json \
+ rubygem-request_store>=1.0:devel/rubygem-request_store
+
+USES= cpe gem
+CPE_VENDOR= ${PORTNAME}_project
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-gon-rails-gitlab/distinfo b/www/rubygem-gon-rails-gitlab/distinfo
new file mode 100644
index 000000000000..70a568978163
--- /dev/null
+++ b/www/rubygem-gon-rails-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1619177531
+SHA256 (rubygem/gon-6.4.0.gem) = e3a618d659392890f1aa7db420f17c75fd7d35aeb5f8fe003697d02c4b88d2f0
+SIZE (rubygem/gon-6.4.0.gem) = 158720
diff --git a/www/rubygem-gon-rails-gitlab/pkg-descr b/www/rubygem-gon-rails-gitlab/pkg-descr
new file mode 100644
index 000000000000..f3dfc03b45c8
--- /dev/null
+++ b/www/rubygem-gon-rails-gitlab/pkg-descr
@@ -0,0 +1,2 @@
+If you need to send some data to your js files and you don't want to do this
+with long way trough views and parsing - use this force!
diff --git a/www/rubygem-kaminari-actionview-rails-gitlab/Makefile b/www/rubygem-kaminari-actionview-rails-gitlab/Makefile
new file mode 100644
index 000000000000..954983f1e9fa
--- /dev/null
+++ b/www/rubygem-kaminari-actionview-rails-gitlab/Makefile
@@ -0,0 +1,21 @@
+PORTNAME= kaminari-actionview
+PORTVERSION= 1.2.2
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -rails-gitlab
+
+MAINTAINER= ruby@FreeBSD.org
+COMMENT= Kaminari Action View adapter
+WWW= https://github.com/kaminari/kaminari/tree/master/kaminari-actionview
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-actionview-gitlab>=0:devel/rubygem-actionview-gitlab \
+ rubygem-kaminari-core>=${PORTVERSION}:www/rubygem-kaminari-core
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-kaminari-actionview-rails-gitlab/distinfo b/www/rubygem-kaminari-actionview-rails-gitlab/distinfo
new file mode 100644
index 000000000000..9e9ced8bcaa2
--- /dev/null
+++ b/www/rubygem-kaminari-actionview-rails-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1641046940
+SHA256 (rubygem/kaminari-actionview-1.2.2.gem) = 1330f6fc8b59a4a4ef6a549ff8a224797289ebf7a3a503e8c1652535287cc909
+SIZE (rubygem/kaminari-actionview-1.2.2.gem) = 6656
diff --git a/www/rubygem-kaminari-actionview-rails-gitlab/pkg-descr b/www/rubygem-kaminari-actionview-rails-gitlab/pkg-descr
new file mode 100644
index 000000000000..e0618fca67d8
--- /dev/null
+++ b/www/rubygem-kaminari-actionview-rails-gitlab/pkg-descr
@@ -0,0 +1 @@
+kaminari-actionview provides pagination helpers for your Action View templates.
diff --git a/www/rubygem-kaminari-activerecord-rails-gitlab/Makefile b/www/rubygem-kaminari-activerecord-rails-gitlab/Makefile
new file mode 100644
index 000000000000..b11458d6b41b
--- /dev/null
+++ b/www/rubygem-kaminari-activerecord-rails-gitlab/Makefile
@@ -0,0 +1,21 @@
+PORTNAME= kaminari-activerecord
+PORTVERSION= 1.2.2
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -rails-gitlab
+
+MAINTAINER= ruby@FreeBSD.org
+COMMENT= Kaminari Active Record adapter
+WWW= https://github.com/kaminari/kaminari/tree/master/kaminari-activerecord
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-activerecord-gitlab>=0:databases/rubygem-activerecord-gitlab \
+ rubygem-kaminari-core>=${PORTVERSION}:www/rubygem-kaminari-core
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-kaminari-activerecord-rails-gitlab/distinfo b/www/rubygem-kaminari-activerecord-rails-gitlab/distinfo
new file mode 100644
index 000000000000..85db9296f918
--- /dev/null
+++ b/www/rubygem-kaminari-activerecord-rails-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1641046950
+SHA256 (rubygem/kaminari-activerecord-1.2.2.gem) = 0dd3a67bab356a356f36b3b7236bcb81cef313095365befe8e98057dd2472430
+SIZE (rubygem/kaminari-activerecord-1.2.2.gem) = 8192
diff --git a/www/rubygem-kaminari-activerecord-rails-gitlab/pkg-descr b/www/rubygem-kaminari-activerecord-rails-gitlab/pkg-descr
new file mode 100644
index 000000000000..f668bf61ed99
--- /dev/null
+++ b/www/rubygem-kaminari-activerecord-rails-gitlab/pkg-descr
@@ -0,0 +1 @@
+kaminari-activerecord lets your Active Record models be paginatable.
diff --git a/www/rubygem-kaminari-rails-gitlab/Makefile b/www/rubygem-kaminari-rails-gitlab/Makefile
new file mode 100644
index 000000000000..70015842acd4
--- /dev/null
+++ b/www/rubygem-kaminari-rails-gitlab/Makefile
@@ -0,0 +1,25 @@
+PORTNAME= kaminari
+PORTVERSION= 1.2.2
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -rails-gitlab
+
+MAINTAINER= ruby@FreeBSD.org
+COMMENT= Sophisticated paginator for Rails 4+
+WWW= https://github.com/kaminari/kaminari
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-activesupport-gitlab>=4.1.0:devel/rubygem-activesupport-gitlab \
+ rubygem-kaminari-actionview-rails-gitlab>=${PORTVERSION}:www/rubygem-kaminari-actionview-rails-gitlab \
+ rubygem-kaminari-activerecord-rails-gitlab>=${PORTVERSION}:www/rubygem-kaminari-activerecord-rails-gitlab \
+ rubygem-kaminari-core>=${PORTVERSION}:www/rubygem-kaminari-core
+
+USES= cpe gem
+
+NO_ARCH= yes
+
+CPE_VENDOR= kaminari_project
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-kaminari-rails-gitlab/distinfo b/www/rubygem-kaminari-rails-gitlab/distinfo
new file mode 100644
index 000000000000..f8e7efd0cf3a
--- /dev/null
+++ b/www/rubygem-kaminari-rails-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1641046962
+SHA256 (rubygem/kaminari-1.2.2.gem) = c4076ff9adccc6109408333f87b5c4abbda5e39dc464bd4c66d06d9f73442a3e
+SIZE (rubygem/kaminari-1.2.2.gem) = 23552
diff --git a/www/rubygem-kaminari-rails-gitlab/pkg-descr b/www/rubygem-kaminari-rails-gitlab/pkg-descr
new file mode 100644
index 000000000000..9f20e0a09f60
--- /dev/null
+++ b/www/rubygem-kaminari-rails-gitlab/pkg-descr
@@ -0,0 +1,2 @@
+Kaminari is a Scope & Engine based, clean, powerful, agnostic, customizable and
+sophisticated paginator for Rails 3
diff --git a/www/rubygem-lograge-rails-gitlab/Makefile b/www/rubygem-lograge-rails-gitlab/Makefile
new file mode 100644
index 000000000000..be924d3cc367
--- /dev/null
+++ b/www/rubygem-lograge-rails-gitlab/Makefile
@@ -0,0 +1,22 @@
+PORTNAME= lograge
+PORTVERSION= 0.14.0
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -rails-gitlab
+
+MAINTAINER= ruby@FreeBSD.org
+COMMENT= Tame Rails' multi-line logging into a single line per request #'
+WWW= https://github.com/roidrage/lograge
+
+LICENSE= MIT
+
+RUN_DEPENDS= rubygem-actionpack-gitlab>=4:www/rubygem-actionpack-gitlab \
+ rubygem-activesupport-gitlab>=4:devel/rubygem-activesupport-gitlab \
+ rubygem-railties-gitlab>=4:www/rubygem-railties-gitlab \
+ rubygem-request_store>=1.0<2:devel/rubygem-request_store
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-lograge-rails-gitlab/distinfo b/www/rubygem-lograge-rails-gitlab/distinfo
new file mode 100644
index 000000000000..e43a648f18f6
--- /dev/null
+++ b/www/rubygem-lograge-rails-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1697030448
+SHA256 (rubygem/lograge-0.14.0.gem) = 42371a75823775f166f727639f5ddce73dd149452a55fc94b90c303213dc9ae1
+SIZE (rubygem/lograge-0.14.0.gem) = 11264
diff --git a/www/rubygem-lograge-rails-gitlab/pkg-descr b/www/rubygem-lograge-rails-gitlab/pkg-descr
new file mode 100644
index 000000000000..e7f52af2c168
--- /dev/null
+++ b/www/rubygem-lograge-rails-gitlab/pkg-descr
@@ -0,0 +1,6 @@
+Tame Rails' multi-line logging into a single line per request
+
+Lograge is an attempt to bring sanity to Rails' noisy and unusable, unparsable
+and, in the context of running multiple processes and servers, unreadable
+default logging output. Rails' default approach to log everything is great
+during development, it's terrible when running it in production.
diff --git a/www/rubygem-rails-gitlab/Makefile b/www/rubygem-rails-gitlab/Makefile
new file mode 100644
index 000000000000..fad6645b5e89
--- /dev/null
+++ b/www/rubygem-rails-gitlab/Makefile
@@ -0,0 +1,49 @@
+PORTNAME= rails
+PORTVERSION= ${RAILS_VERSION}
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Full-stack web application framework
+WWW= https://rubyonrails.org/ \
+ https://github.com/rails/rails
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-actioncable-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actioncable-gitlab \
+ rubygem-actionmailbox-gitlab>=${PORTVERSION}<${PORTVERSION}_99:mail/rubygem-actionmailbox-gitlab \
+ rubygem-actionmailer-gitlab>=${PORTVERSION}<${PORTVERSION}_99:mail/rubygem-actionmailer-gitlab \
+ rubygem-actionpack-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actionpack-gitlab \
+ rubygem-actiontext-gitlab>=${PORTVERSION}<${PORTVERSION}_99:textproc/rubygem-actiontext-gitlab \
+ rubygem-actionview-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-actionview-gitlab \
+ rubygem-activejob-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activejob-gitlab \
+ rubygem-activemodel-gitlab>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-activemodel-gitlab \
+ rubygem-activerecord-gitlab>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-activerecord-gitlab \
+ rubygem-activestorage-gitlab>=${PORTVERSION}<${PORTVERSION}_99:net/rubygem-activestorage-gitlab \
+ rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \
+ rubygem-bundler>=1.15.0:sysutils/rubygem-bundler \
+ rubygem-railties-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-railties-gitlab
+
+USES= cpe gem
+
+NO_ARCH= yes
+
+CPE_VENDOR= rubyonrails
+CPE_PRODUCT= ruby_on_rails
+
+PORTSCOUT= limit:^7\.1\.
+
+.include <bsd.port.pre.mk>
+
+.if ${RUBY_VER} <= 3.1
+RUN_DEPENDS+= rubygem-cgi>=0.3.6:www/rubygem-cgi
+.endif
+
+.if ${RUBY_VER} == 3.1
+RUN_DEPENDS+= rubygem-error_highlight>=0.4.0:devel/rubygem-error_highlight
+.endif
+
+.include "${.CURDIR}/../../www/gitlab/Makefile.common"
+.include <bsd.port.post.mk>
diff --git a/www/rubygem-rails-gitlab/distinfo b/www/rubygem-rails-gitlab/distinfo
new file mode 100644
index 000000000000..1ca3ce97bc6c
--- /dev/null
+++ b/www/rubygem-rails-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1734888826
+SHA256 (rubygem/rails-7.1.5.1.gem) = 05aea2ed7b6392b41ce0fc11455de118455025a431b6ea334a7ac2b101608804
+SIZE (rubygem/rails-7.1.5.1.gem) = 7168
diff --git a/www/rubygem-rails-gitlab/pkg-descr b/www/rubygem-rails-gitlab/pkg-descr
new file mode 100644
index 000000000000..5936b0adc42e
--- /dev/null
+++ b/www/rubygem-rails-gitlab/pkg-descr
@@ -0,0 +1,23 @@
+Rails is a web-application framework that includes everything needed to create
+database-backed web applications according to the Model-View-Controller (MVC)
+pattern.
+
+Understanding the MVC pattern is key to understanding Rails. MVC divides your
+application into three layers: Model, View, and Controller, each with a specific
+responsibility.
+
+Active Record, Active Model, Action Pack, and Action View can each be used
+independently outside Rails.
+
+In addition to that, Rails also comes with:
+- Action Mailer, a library to generate and send emails
+- Action Mailbox, a library to receive emails within a Rails application
+- Active Job, a framework for declaring jobs and making them run on a variety of
+ queuing backends
+- Action Cable, a framework to integrate WebSockets with a Rails application
+- Active Storage, a library to attach cloud and local files to Rails
+ applications
+- Action Text, a library to handle rich text content
+- Active Support, a collection of utility classes and standard library
+ extensions that are useful for Rails, and may also be used independently
+ outside Rails
diff --git a/www/rubygem-railties-gitlab/Makefile b/www/rubygem-railties-gitlab/Makefile
new file mode 100644
index 000000000000..0ad939166601
--- /dev/null
+++ b/www/rubygem-railties-gitlab/Makefile
@@ -0,0 +1,36 @@
+PORTNAME= railties
+PORTVERSION= ${RAILS_VERSION}
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Rails internals: application bootup, plugins, generators, and rake tasks
+WWW= https://github.com/rails/rails/tree/master/railties \
+ https://rubyonrails.org/
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-actionpack-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actionpack-gitlab \
+ rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \
+ rubygem-irb-gitlab>=0:devel/rubygem-irb-gitlab \
+ rubygem-rackup10>=1.0.0:www/rubygem-rackup10 \
+ rubygem-rake>=12.2:devel/rubygem-rake \
+ rubygem-thor>=1.2.2<2:devel/rubygem-thor \
+ rubygem-zeitwerk>=2.6<3:devel/rubygem-zeitwerk
+
+USES= gem shebangfix
+
+NO_ARCH= yes
+
+PLIST_FILES= bin/rails
+
+CONFLICTS_INSTALL= rubygem-railties[0-9] rubygem-railties[0-9][0-9]
+
+PORTSCOUT= limit:^7\.1\.
+
+SHEBANG_FILES= lib/rails/generators/rails/app/templates/docker-entrypoint.tt
+
+.include "${.CURDIR}/../../www/gitlab/Makefile.common"
+.include <bsd.port.mk>
diff --git a/www/rubygem-railties-gitlab/distinfo b/www/rubygem-railties-gitlab/distinfo
new file mode 100644
index 000000000000..0650bb7c3d47
--- /dev/null
+++ b/www/rubygem-railties-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1734888828
+SHA256 (rubygem/railties-7.1.5.1.gem) = 0be15562e2ded4efdc1b6c30f884b6d838c9ba49573dde042334b752b043e2fb
+SIZE (rubygem/railties-7.1.5.1.gem) = 182272
diff --git a/www/rubygem-railties-gitlab/pkg-descr b/www/rubygem-railties-gitlab/pkg-descr
new file mode 100644
index 000000000000..fbc0144b3be4
--- /dev/null
+++ b/www/rubygem-railties-gitlab/pkg-descr
@@ -0,0 +1,4 @@
+Railties is responsible for gluing all frameworks together. Overall, it:
+- handles the bootstrapping process for a Rails application;
+- manages the rails command line interface;
+- and provides the Rails generators core.
diff --git a/www/rubygem-redis-rack-gitlab/Makefile b/www/rubygem-redis-rack-gitlab/Makefile
new file mode 100644
index 000000000000..f330ace9ea51
--- /dev/null
+++ b/www/rubygem-redis-rack-gitlab/Makefile
@@ -0,0 +1,25 @@
+PORTNAME= redis-rack
+PORTVERSION= 3.0.0
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Redis Store for Rack
+WWW= https://redis-store.org/redis-rack/ \
+ https://github.com/redis-store/redis-rack
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-rack-session10>=0.2.0:www/rubygem-rack-session10 \
+ rubygem-redis-store>=1.2<2:devel/rubygem-redis-store
+
+USES= gem
+
+NO_ARCH= yes
+
+post-install:
+ ${RM} ${STAGEDIR}${PREFIX}/bin/appraisal ${STAGEDIR}${PREFIX}/bin/rake
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-redis-rack-gitlab/distinfo b/www/rubygem-redis-rack-gitlab/distinfo
new file mode 100644
index 000000000000..fc78f75e6b06
--- /dev/null
+++ b/www/rubygem-redis-rack-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1702028346
+SHA256 (rubygem/redis-rack-3.0.0.gem) = abb50b82ae10ad4d11ca2e4901bfc2b98256cdafbbd95f80c86fc9e001478380
+SIZE (rubygem/redis-rack-3.0.0.gem) = 14336
diff --git a/www/rubygem-redis-rack-gitlab/pkg-descr b/www/rubygem-redis-rack-gitlab/pkg-descr
new file mode 100644
index 000000000000..d487558f190f
--- /dev/null
+++ b/www/rubygem-redis-rack-gitlab/pkg-descr
@@ -0,0 +1 @@
+Redis Store for Rack
diff --git a/www/rubygem-responders-rails-gitlab/Makefile b/www/rubygem-responders-rails-gitlab/Makefile
new file mode 100644
index 000000000000..63db73157e24
--- /dev/null
+++ b/www/rubygem-responders-rails-gitlab/Makefile
@@ -0,0 +1,21 @@
+PORTNAME= responders
+PORTVERSION= 3.1.1
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -rails-gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Simple Ruby DSL for making HTTP requests
+WWW= https://github.com/heartcombo/responders
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-actionpack-gitlab>=5.2:www/rubygem-actionpack-gitlab \
+ rubygem-railties-gitlab>=5.2:www/rubygem-railties-gitlab
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-responders-rails-gitlab/distinfo b/www/rubygem-responders-rails-gitlab/distinfo
new file mode 100644
index 000000000000..6731238316f3
--- /dev/null
+++ b/www/rubygem-responders-rails-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1714227796
+SHA256 (rubygem/responders-3.1.1.gem) = 92f2a87e09028347368639cfb468f5fefa745cb0dc2377ef060db1cdd79a341a
+SIZE (rubygem/responders-3.1.1.gem) = 20480
diff --git a/www/rubygem-responders-rails-gitlab/pkg-descr b/www/rubygem-responders-rails-gitlab/pkg-descr
new file mode 100644
index 000000000000..22f8e4f8553b
--- /dev/null
+++ b/www/rubygem-responders-rails-gitlab/pkg-descr
@@ -0,0 +1 @@
+Responders provides a set of responders modules to dry up your Rails app.