diff options
Diffstat (limited to 'www/gitlab')
| -rw-r--r-- | www/gitlab/Makefile | 2 | ||||
| -rw-r--r-- | www/gitlab/Makefile.common | 2 | ||||
| -rw-r--r-- | www/gitlab/distinfo | 12 | ||||
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 3a98c3b4a734..68ffe59a3f87 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -163,7 +163,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-rouge-gitlab>=4.6.1<4.7:textproc/rubygem-rouge-gitlab \ rubygem-truncato>=0.7.13<0.8.0:textproc/rubygem-truncato \ rubygem-nokogiri>=1.18.10<2:textproc/rubygem-nokogiri \ - rubygem-gitlab-glfm-markdown>=0.0.38<0.1:textproc/rubygem-gitlab-glfm-markdown \ + rubygem-gitlab-glfm-markdown>=0.0.39<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 \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 85156f73a42d..0b3200a8fbe3 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,4 +1,4 @@ -GITLAB_VERSION= 18.6.1 +GITLAB_VERSION= 18.6.2 GITLAB_PORTREVISION= 3 # decrease this only if GITLAB_KAS_GRPC_VERSION is upgraded # Git version gitaly should use (from gitlab mirror) diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index 63867e3852b9..ca63e8700ceb 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1764220477 -SHA256 (gitlab-foss-v18.6.1.tar.bz2) = d85d6d824089cc12016fa8d3a5037cd254dff3c1e8ad477e6a1153851161e1a0 -SIZE (gitlab-foss-v18.6.1.tar.bz2) = 126836032 -TIMESTAMP = 1764220540 -SHA256 (gitlab-v18.6.1-ee.tar.bz2) = d26f8ce1949e9283ce6766e46798752a448c78055f47d82d6433fcf27aaacd6d -SIZE (gitlab-v18.6.1-ee.tar.bz2) = 143698518 +TIMESTAMP = 1765426102 +SHA256 (gitlab-foss-v18.6.2.tar.bz2) = 6e0ee01b940be896e256ced4d312967101e489556a9ac30d3c413a8986272c4e +SIZE (gitlab-foss-v18.6.2.tar.bz2) = 126869309 +TIMESTAMP = 1765426143 +SHA256 (gitlab-v18.6.2-ee.tar.bz2) = 7c53ea1b62d8061c1f7c125e390398b709cd9a325cbf2c23e35b736a48736db4 +SIZE (gitlab-v18.6.2-ee.tar.bz2) = 143720563 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index cfe5cabc50e5..b2222c8a2f81 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2025-11-19 16:58:17 UTC +--- Gemfile.orig 2025-12-10 01:46:48 UTC +++ Gemfile @@ -169,7 +169,7 @@ gem 'graphql', '2.5.11', feature_category: :api @@ -154,7 +154,7 @@ - # 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.26.0', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 3.1.0', require: false, feature_category: :tooling -end - gem 'octokit', '~> 9.0', feature_category: :importers |