summaryrefslogtreecommitdiff
path: root/www/gitlab
diff options
context:
space:
mode:
Diffstat (limited to 'www/gitlab')
-rw-r--r--www/gitlab/Makefile8
-rw-r--r--www/gitlab/Makefile.common4
-rw-r--r--www/gitlab/distinfo12
3 files changed, 12 insertions, 12 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 1e8c0f37dd1e..6c53e4f1af4a 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -32,7 +32,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
gitlab-elasticsearch-indexer>=5.7.0:textproc/gitlab-elasticsearch-indexer \
gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \
gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \
- gitlab-shell>=14.44.0:devel/gitlab-shell \
+ gitlab-shell>=14.45.2:devel/gitlab-shell \
gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \
gitlab-zoekt-indexer>=1.2.0:textproc/gitlab-zoekt-indexer \
redis>=6.2.11:databases/redis \
@@ -68,7 +68,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
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 \
- rubygem-ruby-saml-gitlab>=1.18<2:security/rubygem-ruby-saml-gitlab \
+ rubygem-ruby-saml-gitlab>=1.18.1<2:security/rubygem-ruby-saml-gitlab \
rubygem-omniauth-saml-gitlab>=2.2.4<3:security/rubygem-omniauth-saml-gitlab \
rubygem-omniauth>=2.1.3<3:security/rubygem-omniauth \
rubygem-omniauth-auth0-gitlab>=3.1.1<3.2.0:net/rubygem-omniauth-auth0-gitlab \
@@ -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 8ecbae27d4a3..1539bc1f14c2 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,5 +1,5 @@
-GITLAB_VERSION= 18.3.1
-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 513bc2f6b7b5..982294f6ac00 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1756437955
-SHA256 (gitlab-foss-v18.3.1.tar.bz2) = 6e6a71560915da21f52a35f8592824a5fa48054b2d113250b7183b04657157b9
-SIZE (gitlab-foss-v18.3.1.tar.bz2) = 122193686
-TIMESTAMP = 1756437995
-SHA256 (gitlab-v18.3.1-ee.tar.bz2) = 32da4c6475a11bf425b7f63e2cadc94b4b8b5478d13176623a6b6f3df861c1b3
-SIZE (gitlab-v18.3.1-ee.tar.bz2) = 138138304
+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