diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2021-07-03 07:45:12 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2021-07-03 07:50:19 +0000 |
| commit | da75672c1fa6ed42eb2413b52aa7bcb0b1117ed3 (patch) | |
| tree | f95d33f2ff4970389df5233cabcbea490781be99 | |
| parent | 2aba0de66ba3438c71899b50e0fb00863c27fa9b (diff) | |
www/gitlab-ce: Fixed problem with asset compilation
The old autoprefixer gem used by gitlab cause at the upgrade the
following error message (cause by newer execjs gem):
Done in 0.68s.
rake aborted!
ExecJS::ProgramError: TypeError: Cannot read property 'version' of undefined
eval (eval at <anonymous> ((execjs):1:213), <anonymous>:1:10)
(execjs):1:213
(execjs):19:14
(execjs):1:40
Object.<anonymous> ((execjs):1:58)
Module._compile (node:internal/modules/cjs/loader:1109:14)
Object.Module._extensions..js (node:internal/modules/cjs/loader:1138:10)
Module.load (node:internal/modules/cjs/loader:989:32)
Function.Module._load (node:internal/modules/cjs/loader:829:14)
Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:76:12)
/usr/local/www/gitlab-ce/lib/gitlab/task_helpers.rb:18:in `invoke_and_time_task'
/usr/local/www/gitlab-ce/lib/tasks/gitlab/assets.rake:59:in `each'
/usr/local/www/gitlab-ce/lib/tasks/gitlab/assets.rake:59:in `block (3 levels) in <top (required)>'
/usr/local/bin/bundle:23:in `load'
/usr/local/bin/bundle:23:in `<main>'
Tasks: TOP => assets:precompile
(See full trace by running task with --trace)
| -rw-r--r-- | www/gitlab-ce/Makefile | 4 | ||||
| -rw-r--r-- | www/gitlab-ce/files/patch-Gemfile | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index b1d84d407ccf..05bdad3578ea 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -2,7 +2,7 @@ PORTNAME= gitlab-ce PORTVERSION= 14.0.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -176,7 +176,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-gitlab_chronic_duration>=0.10.6.2<0.10.7:devel/rubygem-gitlab_chronic_duration \ rubygem-rack-proxy06>=0.6.0<0.7.0:www/rubygem-rack-proxy06 \ rubygem-sassc-rails-rails61>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails61 \ - rubygem-autoprefixer-rails1020>=10.2.0.0<10.2.1:textproc/rubygem-autoprefixer-rails1020 \ + rubygem-autoprefixer-rails>=10.2.5.1<10.2.6:textproc/rubygem-autoprefixer-rails \ rubygem-terser>=1.0.2:textproc/rubygem-terser \ rubygem-addressable>=2.7<3:www/rubygem-addressable \ rubygem-gemojione>=3.3<4.0:graphics/rubygem-gemojione \ diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index a34a04d953af..9ad5d8137744 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -17,6 +17,15 @@ gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import) gem 'hashie' +@@ -286,7 +285,7 @@ gem 'gitlab_chronic_duration', '~> 0.10.6.2' + gem 'rack-proxy', '~> 0.6.0' + + gem 'sassc-rails', '~> 2.1.0' +-gem 'autoprefixer-rails', '10.2.0.0' ++gem 'autoprefixer-rails', '10.2.5.1' + gem 'terser', '1.0.2' + + gem 'addressable', '~> 2.7' @@ -309,7 +308,7 @@ gem 'sentry-raven', '~> 3.1' # and https://github.com/pganalyze/pg_query/pull/213 are # released. gitlab-labkit will need to be updated to use the pg_query |