Add comments to all patches
This commit is contained in:
parent
f68f06a658
commit
96205d3782
19 changed files with 46 additions and 0 deletions
|
@ -1,3 +1,5 @@
|
|||
Make test dependencies conditional so we can enable them when running autopkgtest
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -329,7 +329,7 @@
|
||||
|
|
2
debian/patches/0340-relax-httparty.patch
vendored
2
debian/patches/0340-relax-httparty.patch
vendored
|
@ -1,3 +1,5 @@
|
|||
Allow newer versions of httparty to satisfy dependency
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -191,7 +191,7 @@
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
Allow newer version to satisfy requirement
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -321,7 +321,7 @@
|
||||
|
|
2
debian/patches/0350-relax-rdoc.patch
vendored
2
debian/patches/0350-relax-rdoc.patch
vendored
|
@ -1,3 +1,5 @@
|
|||
Allow rdoc from ruby 2.5 to match requirement
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -141,7 +141,7 @@
|
||||
|
|
|
@ -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 @@
|
||||
|
|
2
debian/patches/0440-remove-puma.patch
vendored
2
debian/patches/0440-remove-puma.patch
vendored
|
@ -1,3 +1,5 @@
|
|||
We are using unicorn so don't need puma
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -168,12 +168,6 @@
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
Embed this gem until it is packaged
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -310,7 +310,8 @@
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
Embed this gem until gitlab moved to 7.x version
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -128,7 +128,7 @@
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
Embed this gem until gitlab moved to 7.x version
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -129,7 +129,7 @@
|
||||
|
|
|
@ -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 @@
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
This gem is used only in gitlab Enterprise Edition
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -49,9 +49,6 @@
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
Allow newer patch releases to match requirement
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -143,7 +143,7 @@
|
||||
|
|
2
debian/patches/0500-set-webpack-root.patch
vendored
2
debian/patches/0500-set-webpack-root.patch
vendored
|
@ -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 @@
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
These are not required in production
|
||||
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -145,65 +145,7 @@
|
||||
|
|
|
@ -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 @@
|
||||
|
|
2
debian/patches/0630-fix-mail-room-path.patch
vendored
2
debian/patches/0630-fix-mail-room-path.patch
vendored
|
@ -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 @@
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
Fix for debian package layout
|
||||
|
||||
--- a/config/settings.rb
|
||||
+++ b/config/settings.rb
|
||||
@@ -10,7 +10,7 @@
|
||||
|
|
|
@ -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 @@
|
||||
|
|
2
debian/patches/0750-fix-relative-paths.patch
vendored
2
debian/patches/0750-fix-relative-paths.patch
vendored
|
@ -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 @@
|
||||
|
|
Loading…
Reference in a new issue