summaryrefslogtreecommitdiff
path: root/www/gitlab/Makefile.common
diff options
context:
space:
mode:
Diffstat (limited to 'www/gitlab/Makefile.common')
-rw-r--r--www/gitlab/Makefile.common13
1 files changed, 7 insertions, 6 deletions
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 1c759292e321..646a93dc3e95 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,18 +1,19 @@
-GITLAB_VERSION= 18.5.2
-GITLAB_PORTREVISION= 1
+GITLAB_VERSION= 18.6.0
+GITLAB_PORTREVISION= 0
# Git version gitaly should use (from gitlab mirror)
# Find current tag from Makefile and .gitlab-ci.yaml
# and from https://gitlab.com/gitlab-org/git/-/tags
GITLAB_GIT_VERSION= 2.50.0
-GITLAB_GIT_MASTER_VERSION= 23466173824c0a0f835c0d790c2f38156ae6284a
# return something like x.yy
GITLAB_GIT_VERSION_SHORT= ${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/}
+GITLAB_GIT_MASTER_VERSION= 419c72cb8ada252b260efc38ff91fe201de7c8c3
+GITLAB_GIT_PREV_VERSION= 23466173824c0a0f835c0d790c2f38156ae6284a
# Overwrite version for gitlab-kas-grpc
-GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION}
-#GITLAB_KAS_GRPC_VERSION= 18.2.1
+#GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION}
+GITLAB_KAS_GRPC_VERSION= 18.5.2
# Rails version
-RAILS_VERSION= 7.1.5.2
+RAILS_VERSION= 7.1.6