Skip to content

Commit

Permalink
www/gitlab-ce: fix devel/rubygem-sprockets3 upgrade to 3.7.3
Browse files Browse the repository at this point in the history
fixes a regression from
af60e43

gitlab applies a patch to sprockets3 to apply a thread safe fix:
rails/sprockets#759

So modified the patch to work also with version 3.7.3 as regarding
the changelog, this patch will not be merged back into version 3
of sprocket:
rails/sprockets#759 (comment)

It looks like gitlab project will maybe port to another module:
https://gitlab.com/gitlab-org/gitlab/-/issues/373997#note_1360248557
https://gitlab.com/gitlab-org/gitlab/-/issues/373997#note_1785295197
  • Loading branch information
mfechner committed Apr 2, 2024
1 parent 8c5b73b commit 1eec19b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion www/gitlab-ce/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PORTNAME= gitlab-ce
PORTVERSION= 16.10.1
DISTVERSIONPREFIX= v
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www devel

# include patch to fix database migration
Expand Down
11 changes: 11 additions & 0 deletions www/gitlab-ce/files/patch-config_initializers_sprockets__patch.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- config/initializers/sprockets_patch.rb.orig 2024-04-02 08:17:37 UTC
+++ config/initializers/sprockets_patch.rb
@@ -8,7 +8,7 @@

require 'sprockets/utils'

-unless Gem::Version.new(Sprockets::VERSION) == Gem::Version.new('3.7.2')
+unless Gem::Version.new(Sprockets::VERSION) == Gem::Version.new('3.7.3')
raise 'New version of Sprockets detected. This patch can likely be removed.'
end

0 comments on commit 1eec19b

Please sign in to comment.