summaryrefslogtreecommitdiff
path: root/www/gitlab
diff options
context:
space:
mode:
Diffstat (limited to 'www/gitlab')
-rw-r--r--www/gitlab/Makefile5
-rw-r--r--www/gitlab/Makefile.common4
-rw-r--r--www/gitlab/distinfo12
3 files changed, 10 insertions, 11 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 8e5a9710dc85..377c7e5226b4 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -32,7 +32,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
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} \
@@ -184,7 +184,6 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
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-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 \
rubygem-slack-messenger>=2.3.5<2.4.0:devel/rubygem-slack-messenger \
@@ -292,7 +291,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>=2.11.2<2.12: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-introspect>=0.8<1:devel/rubygem-oj-introspect \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 9e0f66298ff7..0daac7e46e8e 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,5 +1,5 @@
-GITLAB_VERSION= 18.0.0
-GITLAB_PORTREVISION= 0
+GITLAB_VERSION= 18.0.1
+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 3c1c169ae9a0..f42eb8e4eca8 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-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
+TIMESTAMP = 1747896498
+SHA256 (gitlab-foss-v18.0.1.tar.bz2) = 2159ad10df8bb7d5d084802e8954bcc5db3328fabcd2496f8db9aa2625bfbd93
+SIZE (gitlab-foss-v18.0.1.tar.bz2) = 116966990
+TIMESTAMP = 1747896512
+SHA256 (gitlab-v18.0.1-ee.tar.bz2) = c49d1d8fd730d19f0b67bcfb89d174524fe43211c1671ba43f996c6868ff8667
+SIZE (gitlab-v18.0.1-ee.tar.bz2) = 131786899