summaryrefslogtreecommitdiff
path: root/www/gitlab
diff options
context:
space:
mode:
Diffstat (limited to 'www/gitlab')
-rw-r--r--www/gitlab/Makefile4
-rw-r--r--www/gitlab/Makefile.common4
-rw-r--r--www/gitlab/distinfo12
3 files changed, 10 insertions, 10 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index b8e0e115a894..6c53e4f1af4a 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -82,7 +82,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-openid_connect>=2.3.1<2.4:net/rubygem-openid_connect \
rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \
rubygem-rack-oauth2-gitlab>=2.2.1<2.3:security/rubygem-rack-oauth2-gitlab \
- rubygem-jwt>=2.10.2<2.11:www/rubygem-jwt \
+ rubygem-jwt2>=2.10.2<2.11:www/rubygem-jwt2 \
rubygem-gssapi>=1.3.1<1.4:security/rubygem-gssapi \
rubygem-recaptcha>=5.12<6.0:devel/rubygem-recaptcha \
rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \
@@ -168,7 +168,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-diffy>=3.4.4<4:textproc/rubygem-diffy \
rubygem-rack22>=2.2.17,3<2.3,3:www/rubygem-rack22 \
rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \
- rubygem-puma>=6.6.1<6.6.2:www/rubygem-puma \
+ rubygem-puma6>=6.6.1<6.6.2:www/rubygem-puma6 \
rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \
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 \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 3b0ff1a9bf02..1539bc1f14c2 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,5 +1,5 @@
-GITLAB_VERSION= 18.3.2
-GITLAB_PORTREVISION= 0
+GITLAB_VERSION= 18.3.3
+GITLAB_PORTREVISION= 1
# Git version gitaly should use (from gitlab mirror)
# Find current tag from Makefile and .gitlab-ci.yaml
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index 1fb18302b639..982294f6ac00 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1757514994
-SHA256 (gitlab-foss-v18.3.2.tar.bz2) = f8ee774449e49c1500335af8d5978e49858cb206f938778ce724bb92e1593884
-SIZE (gitlab-foss-v18.3.2.tar.bz2) = 122213821
-TIMESTAMP = 1757515073
-SHA256 (gitlab-v18.3.2-ee.tar.bz2) = 59d927b3dc3dbb918012f7431fcb75c4f4efbf792c1d1a0f04dcca8d7043c2a0
-SIZE (gitlab-v18.3.2-ee.tar.bz2) = 138144815
+TIMESTAMP = 1758868718
+SHA256 (gitlab-foss-v18.3.3.tar.bz2) = a9cbf5f39ae5d19cd97a72de82b5cabdddbf25c5ad028deb511ce9dc0192aa17
+SIZE (gitlab-foss-v18.3.3.tar.bz2) = 122265280
+TIMESTAMP = 1758868757
+SHA256 (gitlab-v18.3.3-ee.tar.bz2) = aab3895fb286d0caded53dfad5a1310287091715be4e90f2bba0ed99dfb55905
+SIZE (gitlab-v18.3.3-ee.tar.bz2) = 138170287