diff --git a/debian/patches/0110-make-test-dependencies-conditional.patch b/debian/patches/0110-make-test-dependencies-conditional.patch index c28d862dc6..fd43d960e8 100644 --- a/debian/patches/0110-make-test-dependencies-conditional.patch +++ b/debian/patches/0110-make-test-dependencies-conditional.patch @@ -1,3 +1,5 @@ +Make test dependencies conditional so we can enable them when running autopkgtest + --- a/Gemfile +++ b/Gemfile @@ -329,7 +329,7 @@ diff --git a/debian/patches/0340-relax-httparty.patch b/debian/patches/0340-relax-httparty.patch index ca680ca7e2..faa217675b 100644 --- a/debian/patches/0340-relax-httparty.patch +++ b/debian/patches/0340-relax-httparty.patch @@ -1,3 +1,5 @@ +Allow newer versions of httparty to satisfy dependency + --- a/Gemfile +++ b/Gemfile @@ -191,7 +191,7 @@ diff --git a/debian/patches/0350-relax-method-source.patch b/debian/patches/0350-relax-method-source.patch index 609b93a5fd..a8860f706a 100644 --- a/debian/patches/0350-relax-method-source.patch +++ b/debian/patches/0350-relax-method-source.patch @@ -1,3 +1,5 @@ +Allow newer version to satisfy requirement + --- a/Gemfile +++ b/Gemfile @@ -321,7 +321,7 @@ diff --git a/debian/patches/0350-relax-rdoc.patch b/debian/patches/0350-relax-rdoc.patch index e94b6a23f1..e572fd682a 100644 --- a/debian/patches/0350-relax-rdoc.patch +++ b/debian/patches/0350-relax-rdoc.patch @@ -1,3 +1,5 @@ +Allow rdoc from ruby 2.5 to match requirement + --- a/Gemfile +++ b/Gemfile @@ -141,7 +141,7 @@ diff --git a/debian/patches/0430-remove-gitlab-markup.patch b/debian/patches/0430-remove-gitlab-markup.patch index 02e9b67312..760cfa7858 100644 --- a/debian/patches/0430-remove-gitlab-markup.patch +++ b/debian/patches/0430-remove-gitlab-markup.patch @@ -1,3 +1,7 @@ +gitlab-markup and github-markup are almost same except for some uncommon extra +features in gitlab-markup. Support only github-markup syntax to avoid +maintaining two almost same packages. + --- a/Gemfile +++ b/Gemfile @@ -137,7 +137,6 @@ diff --git a/debian/patches/0440-remove-puma.patch b/debian/patches/0440-remove-puma.patch index f8071f9670..c3bac79596 100644 --- a/debian/patches/0440-remove-puma.patch +++ b/debian/patches/0440-remove-puma.patch @@ -1,3 +1,5 @@ +We are using unicorn so don't need puma + --- a/Gemfile +++ b/Gemfile @@ -168,12 +168,6 @@ diff --git a/debian/patches/0460-embed-derailed-benchmarks.patch b/debian/patches/0460-embed-derailed-benchmarks.patch index ff9ec8fdd3..244e8152b0 100644 --- a/debian/patches/0460-embed-derailed-benchmarks.patch +++ b/debian/patches/0460-embed-derailed-benchmarks.patch @@ -1,3 +1,5 @@ +Embed this gem until it is packaged + --- a/Gemfile +++ b/Gemfile @@ -310,7 +310,8 @@ diff --git a/debian/patches/0480-embed-elasticsearch-model.patch b/debian/patches/0480-embed-elasticsearch-model.patch index 11476bb489..e7787dfa30 100644 --- a/debian/patches/0480-embed-elasticsearch-model.patch +++ b/debian/patches/0480-embed-elasticsearch-model.patch @@ -1,3 +1,5 @@ +Embed this gem until gitlab moved to 7.x version + --- a/Gemfile +++ b/Gemfile @@ -128,7 +128,7 @@ diff --git a/debian/patches/0480-embed-elasticsearch-rails.patch b/debian/patches/0480-embed-elasticsearch-rails.patch index 304f8c2693..1aa30d3f0d 100644 --- a/debian/patches/0480-embed-elasticsearch-rails.patch +++ b/debian/patches/0480-embed-elasticsearch-rails.patch @@ -1,3 +1,5 @@ +Embed this gem until gitlab moved to 7.x version + --- a/Gemfile +++ b/Gemfile @@ -129,7 +129,7 @@ diff --git a/debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch b/debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch index e3b340da5b..fba0d198d4 100644 --- a/debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch +++ b/debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch @@ -1,3 +1,8 @@ +This gem is unmaintained so not a good idea to package it. Once gitlab moves to +aws-sdk 3.0 we can remove this. + +Bug: https://gitlab.com/gitlab-org/gitlab/-/issues/37931 + --- a/Gemfile +++ b/Gemfile @@ -132,7 +132,7 @@ diff --git a/debian/patches/0482-remove-ee-only-gems.patch b/debian/patches/0482-remove-ee-only-gems.patch index 445e1ad9bb..59ff200c01 100644 --- a/debian/patches/0482-remove-ee-only-gems.patch +++ b/debian/patches/0482-remove-ee-only-gems.patch @@ -1,3 +1,5 @@ +This gem is used only in gitlab Enterprise Edition + --- a/Gemfile +++ b/Gemfile @@ -49,9 +49,6 @@ diff --git a/debian/patches/0484-relax-asciidoctor-plantuml.patch b/debian/patches/0484-relax-asciidoctor-plantuml.patch index 12824589d5..9d43e0736e 100644 --- a/debian/patches/0484-relax-asciidoctor-plantuml.patch +++ b/debian/patches/0484-relax-asciidoctor-plantuml.patch @@ -1,3 +1,5 @@ +Allow newer patch releases to match requirement + --- a/Gemfile +++ b/Gemfile @@ -143,7 +143,7 @@ diff --git a/debian/patches/0500-set-webpack-root.patch b/debian/patches/0500-set-webpack-root.patch index 2222827ca0..73ce480730 100644 --- a/debian/patches/0500-set-webpack-root.patch +++ b/debian/patches/0500-set-webpack-root.patch @@ -1,3 +1,5 @@ +Debian specific patch to help webpack find sources + --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -10,7 +10,7 @@ diff --git a/debian/patches/0510-remove-dev-dependencies.patch b/debian/patches/0510-remove-dev-dependencies.patch index 866e3f060e..5587256661 100644 --- a/debian/patches/0510-remove-dev-dependencies.patch +++ b/debian/patches/0510-remove-dev-dependencies.patch @@ -1,3 +1,5 @@ +These are not required in production + --- a/package.json +++ b/package.json @@ -145,65 +145,7 @@ diff --git a/debian/patches/0520-add-system-lib-path-for-webpack.patch b/debian/patches/0520-add-system-lib-path-for-webpack.patch index 73aafbf21b..dd019523b1 100644 --- a/debian/patches/0520-add-system-lib-path-for-webpack.patch +++ b/debian/patches/0520-add-system-lib-path-for-webpack.patch @@ -1,3 +1,5 @@ +Debian specific patch to allow webpack to resolve packaged node modules + --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -148,9 +148,14 @@ diff --git a/debian/patches/0630-fix-mail-room-path.patch b/debian/patches/0630-fix-mail-room-path.patch index 4837524b7d..229cfa325b 100644 --- a/debian/patches/0630-fix-mail-room-path.patch +++ b/debian/patches/0630-fix-mail-room-path.patch @@ -1,3 +1,5 @@ +require_relative does not work with debian package layout + --- a/config/mail_room.yml +++ b/config/mail_room.yml @@ -1,6 +1,6 @@ diff --git a/debian/patches/0660-fix-gitlab-yml-path.patch b/debian/patches/0660-fix-gitlab-yml-path.patch index 914427ae3b..396fbda6a6 100644 --- a/debian/patches/0660-fix-gitlab-yml-path.patch +++ b/debian/patches/0660-fix-gitlab-yml-path.patch @@ -1,3 +1,5 @@ +Fix for debian package layout + --- a/config/settings.rb +++ b/config/settings.rb @@ -10,7 +10,7 @@ diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch index 7a4c1721db..5e126df38d 100644 --- a/debian/patches/0740-use-packaged-modules.patch +++ b/debian/patches/0740-use-packaged-modules.patch @@ -1,3 +1,8 @@ +Use debian packaged node modules when available + - Exclude packaged modules from transpiling + - Remove webpack-bundle-analyzer + - Resolve .json files + --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -6,7 +6,6 @@ diff --git a/debian/patches/0750-fix-relative-paths.patch b/debian/patches/0750-fix-relative-paths.patch index bb63f3900b..81921bb628 100644 --- a/debian/patches/0750-fix-relative-paths.patch +++ b/debian/patches/0750-fix-relative-paths.patch @@ -1,3 +1,5 @@ +Debian specific patch to adapt to debian policy mandated paths + --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -1,6 +1,6 @@