diff options
Diffstat (limited to 'www/gitlab')
| -rw-r--r-- | www/gitlab/Makefile | 2 | ||||
| -rw-r--r-- | www/gitlab/Makefile.common | 4 | ||||
| -rw-r--r-- | www/gitlab/distinfo | 12 | ||||
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 10 |
4 files changed, 16 insertions, 12 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 8bb15d8f52a1..3a8ea497c217 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.9.3<3:www/rubygem-jwt \ + rubygem-jwt29>=2.9.3<3:www/rubygem-jwt29 \ 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 \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 5b26abcfe873..7faf748b2678 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,5 +1,5 @@ -GITLAB_VERSION= 18.2.0 -GITLAB_PORTREVISION= 0 +GITLAB_VERSION= 18.2.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 df7dca2e03fe..67a668af820f 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1752677001 -SHA256 (gitlab-foss-v18.2.0.tar.bz2) = 23a1309fb73f19ccfc3100611e1149a3405563862d697829e9cf0080c9487565 -SIZE (gitlab-foss-v18.2.0.tar.bz2) = 121280838 -TIMESTAMP = 1752677001 -SHA256 (gitlab-v18.2.0-ee.tar.bz2) = 867f7292eec847e786a56c7fb15c7d8139993e3e29e2e7dd0bc9f580167470e9 -SIZE (gitlab-v18.2.0-ee.tar.bz2) = 136600640 +TIMESTAMP = 1753327140 +SHA256 (gitlab-foss-v18.2.1.tar.bz2) = 47df0d49390cf5fb28af71ee99608d826158399c3a164ec64b41aec9c04a0207 +SIZE (gitlab-foss-v18.2.1.tar.bz2) = 121288065 +TIMESTAMP = 1753327140 +SHA256 (gitlab-v18.2.1-ee.tar.bz2) = f1cb7cb49ae20a3ddec3ca36bff457550a7b9383dd8b3ff42cd7104fac0c2bd7 +SIZE (gitlab-v18.2.1-ee.tar.bz2) = 136599618 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 12b4438204ba..f57ee976650d 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2025-07-16 11:39:10 UTC +--- Gemfile.orig 2025-07-22 11:41:34 UTC +++ Gemfile @@ -164,8 +164,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared @@ -182,8 +182,12 @@ gem 'octokit', '~> 9.0', feature_category: :importers # Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688 gem 'faraday-multipart', '~> 1.0', feature_category: :importers -@@ -639,11 +511,11 @@ gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: : - gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :gitaly +@@ -636,14 +508,14 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside + gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat + + # Gitaly GRPC protocol definitions +-gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :gitaly ++gem 'gitaly', '~> 18.1', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'gitlab-kas-grpc', '~> 18.1.0', feature_category: :deployment_management |