diff options
Diffstat (limited to 'www/gitlab')
| -rw-r--r-- | www/gitlab/Makefile | 4 | ||||
| -rw-r--r-- | www/gitlab/Makefile.common | 4 | ||||
| -rw-r--r-- | www/gitlab/distinfo | 12 | ||||
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 6 |
4 files changed, 13 insertions, 13 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 8fc1f0f90c32..4e58653e1bec 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -101,7 +101,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-grape-swagger-entity>=0.5.5<0.6:devel/rubygem-grape-swagger-entity \ rubygem-grape-path-helpers>=2.0.1<2.1:devel/rubygem-grape-path-helpers \ rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \ - rubygem-graphql>=2.4.11<2.5:devel/rubygem-graphql \ + rubygem-graphql>=2.4.13<2.5:devel/rubygem-graphql \ rubygem-apollo_upload_server>=2.1.6<2.2:net/rubygem-apollo_upload_server \ rubygem-ffaker>=2.24.0<3:devel/rubygem-ffaker \ rubygem-hashie>=5.0.0<5.1:devel/rubygem-hashie \ @@ -301,7 +301,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-ed25519>=1.3.0<1.4:security/rubygem-ed25519 \ rubygem-cvss-suite>=3.3.0<3.4:security/rubygem-cvss-suite \ rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \ - rubygem-devfile>=0.4.0<0.5:net/rubygem-devfile \ + rubygem-devfile>=0.4.3<0.5:net/rubygem-devfile \ rubygem-CFPropertyList-gitlab>=3.0.7<3.1:devel/rubygem-CFPropertyList-gitlab \ rubygem-app_store_connect>=0:net/rubygem-app_store_connect \ rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 0380e62b9ba8..f90240ab03de 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,5 +1,5 @@ -GITLAB_VERSION= 17.11.1 -GITLAB_PORTREVISION= 2 +GITLAB_VERSION= 17.11.2 +GITLAB_PORTREVISION= 0 # 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 061b60d47f20..481d3318a987 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1745464764 -SHA256 (gitlab-foss-v17.11.1.tar.bz2) = c2604473f99a61c4b3ba55ceafea5c029eee06f4990346fe9208053edca6955d -SIZE (gitlab-foss-v17.11.1.tar.bz2) = 129896615 -TIMESTAMP = 1745464807 -SHA256 (gitlab-v17.11.1-ee.tar.bz2) = 21130ad52e4107996ce22a1759910f6d071b282c89a043319f3bbb98967e1a6c -SIZE (gitlab-v17.11.1-ee.tar.bz2) = 144397253 +TIMESTAMP = 1746703370 +SHA256 (gitlab-foss-v17.11.2.tar.bz2) = cca1c17742e83a3449b262980ce6522c713eeb9f50dcba4bb831d4e3b32b8ca6 +SIZE (gitlab-foss-v17.11.2.tar.bz2) = 127999225 +TIMESTAMP = 1746703439 +SHA256 (gitlab-v17.11.2-ee.tar.bz2) = 972e2fd9d5dcc6de5472fe720e369a2a3be9eb3c27208d6e82b2e9135bbd0b41 +SIZE (gitlab-v17.11.2-ee.tar.bz2) = 142504844 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 66fa089743a5..408e873e25c9 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,12 +1,12 @@ ---- Gemfile.orig 2025-04-16 04:05:48 UTC +--- Gemfile.orig 2025-05-07 09:41:59 UTC +++ Gemfile @@ -168,8 +168,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared # GraphQL API --gem 'graphql', '2.4.11', path: 'vendor/gems/graphql', feature_category: :api +-gem 'graphql', '2.4.13', feature_category: :api -gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api -+gem 'graphql', '~> 2.4.11', path: 'vendor/gems/graphql', feature_category: :api ++gem 'graphql', '~> 2.4.13', feature_category: :api +#gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api |