summaryrefslogtreecommitdiff
path: root/www/gitlab
diff options
context:
space:
mode:
Diffstat (limited to 'www/gitlab')
-rw-r--r--www/gitlab/Makefile2
-rw-r--r--www/gitlab/distinfo12
-rw-r--r--www/gitlab/files/patch-Gemfile11
3 files changed, 17 insertions, 8 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index e6d6b884c14e..f0510bdfac37 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-${FLAVOR:Uce}
-PORTVERSION= 17.1.0
+PORTVERSION= 17.1.1
DISTVERSIONPREFIX= v
.if ${FLAVOR:U} == ee
DISTVERSIONSUFFIX= -ee
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index f783044c5bd5..ecca1b3fe0d6 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1718791024
-SHA256 (gitlab-foss-v17.1.0.tar.bz2) = 3f85ff78b83d2bed3fd7bcf205e13b5361d5979fc9c805c579a5eb06471614b5
-SIZE (gitlab-foss-v17.1.0.tar.bz2) = 106374768
-TIMESTAMP = 1718791076
-SHA256 (gitlab-v17.1.0-ee.tar.bz2) = e3eec07dc8a9277b45ba193d3a3711adb4cca8b376b356e0028dd7f6ab2d57aa
-SIZE (gitlab-v17.1.0-ee.tar.bz2) = 114925370
+TIMESTAMP = 1719895321
+SHA256 (gitlab-foss-v17.1.1.tar.bz2) = 2eedeea18a1042fbaa96c397ec0d26372141e46a4f067496e60c54d893b1de09
+SIZE (gitlab-foss-v17.1.1.tar.bz2) = 106395522
+TIMESTAMP = 1719895431
+SHA256 (gitlab-v17.1.1-ee.tar.bz2) = 1a4df4d3a02929dd3e8245cdff485fbb2136e9afd2647599f6720c6dabd4ab1d
+SIZE (gitlab-v17.1.1-ee.tar.bz2) = 114926450
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 22b05c6010b3..dd9d6e0337c8 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig 2024-06-19 08:46:16 UTC
+--- Gemfile.orig 2024-06-25 20:33:28 UTC
+++ Gemfile
@@ -58,7 +58,7 @@ gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingF
@@ -215,6 +215,15 @@
gem 'octokit', '~> 8.1', feature_category: :importers
gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared
+@@ -594,7 +478,7 @@ gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/Mis
+ gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
+
+ # Gitaly GRPC protocol definitions
+-gem 'gitaly', '~> 17.0.1', feature_category: :gitaly
++gem 'gitaly', '~> 17.1', feature_category: :gitaly
+
+ # KAS GRPC protocol definitions
+ gem 'kas-grpc', '~> 0.5.0', feature_category: :deployment_management
@@ -620,7 +504,7 @@ gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfil
gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory