realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refresh patches

Browse source
This commit is contained in:
Pirate Praveen 2021-10-28 01:36:19 +05:30
parent 8da35bec51
commit bc37520631
15 changed files with 83 additions and 170 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
debian/patches/0050-relax-stable-libs.patch vendored
View file

@ -3,15 +3,12 @@ gitlab Gemfile
--- a/Gemfile
+++ b/Gemfile
@@ -2,58 +2,58 @@
@@ -4,56 +4,56 @@
source 'https://rubygems.org'
-gem 'rails', '~> 6.1.3.2'
+gem 'rails', '~> 6.1.3','>= 6.1.3.2'
gem 'rails', '~> 6.1.3.2'
-gem 'bootsnap', '~> 1.4.6'
+gem 'bootsnap', '~> 1.4'
+gem 'bootsnap', '~> 1.4', '>= 1.4.6'
# Responders respond_to and respond_with
gem 'responders', '~> 3.0'
@ -28,7 +25,7 @@ gitlab Gemfile
gem 'rugged', '~> 1.1'
-gem 'grape-path-helpers', '~> 1.6.3'
+gem 'grape-path-helpers', '~> 1.6','>= 1.6.3'
+gem 'grape-path-helpers', '~> 1.6', '>= 1.6.3'
gem 'faraday', '~> 1.0'
-gem 'marginalia', '~> 1.10.0'
@ -72,7 +69,7 @@ gitlab Gemfile
-gem 'omniauth_crowd', '~> 2.4.0'
+gem 'omniauth_crowd', '~> 2.4'
gem 'omniauth-authentiq', '~> 0.3.3'
gem 'gitlab-omniauth-openid-connect', '~> 0.4.0', require: 'omniauth_openid_connect'
gem 'gitlab-omniauth-openid-connect', '~> 0.8.0', require: 'omniauth_openid_connect'
-gem 'omniauth-salesforce', '~> 1.0.5'
+gem 'omniauth-salesforce', '~> 1.0','>= 1.0.5'
gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
@ -204,8 +201,9 @@ gitlab Gemfile
+gem 'rdoc', '~> 6.3','>= 6.3.2'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
-gem 'wikicloth', '0.8.1'
-gem 'asciidoctor', '~> 2.0.10'
+gem 'wikicloth', '~> 0.8.1'
+gem 'asciidoctor', '~> 2.0','>= 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
gem 'asciidoctor-plantuml', '~> 0.0.12'
@ -269,7 +267,7 @@ gitlab Gemfile
+gem 'version_sorter', '~> 2.2', '>= 2.2.4'
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.4'
gem 'js_regex', '~> 3.7'
@@ -229,24 +229,24 @@
gem 'device_detector'
@ -326,9 +324,10 @@ gitlab Gemfile
gem 'rack-proxy', '~> 0.6.0'
-gem 'sassc-rails', '~> 2.1.0'
+gem 'sassc-rails', '~> 2.1'
gem 'autoprefixer-rails', '10.2.5.1'
-gem 'autoprefixer-rails', '10.2.5.1'
-gem 'terser', '1.0.2'
+gem 'sassc-rails', '~> 2.1'
+gem 'autoprefixer-rails', '~> 10.2', '>= 10.2.5.1'
+gem 'terser', '~> 1.0','>= 1.0.2'
gem 'addressable', '~> 2.8'
@ -354,7 +353,7 @@ gitlab Gemfile
+gem 'premailer-rails', '~> 1.10','>= 1.10.3'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.20.0'
gem 'gitlab-labkit', '~> 0.21.1'
@@ -318,11 +318,11 @@
# I18n
gem 'ruby_parser', '~> 3.15', require: false
@ -369,7 +368,7 @@ gitlab Gemfile
# Perf bar
gem 'peek', '~> 1.1'
@@ -332,7 +332,7 @@
@@ -332,10 +332,10 @@
# Metrics
gem 'method_source', '~> 1.0', require: false
@ -377,59 +376,12 @@ gitlab Gemfile
+gem 'webrick', '~> 1.6','>= 1.6.1', require: false
gem 'prometheus-client-mmap', '~> 0.12.0', require: 'prometheus/client'
-gem 'warning', '~> 1.2.0'
+gem 'warning', '~> 1.2'
group :development do
@@ -349,38 +349,38 @@
end
group :development, :test do
- gem 'deprecation_toolkit', '~> 1.5.1', require: false
- gem 'bullet', '~> 6.1.3'
+ gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false
+ gem 'bullet', '~> 6.1', '>= 6.1.3'
gem 'pry-byebug'
gem 'pry-rails', '~> 0.3.9'
gem 'pry-shell', '~> 0.4.0'
gem 'awesome_print', require: false
- gem 'database_cleaner', '~> 1.7.0'
- gem 'factory_bot_rails', '~> 6.1.0'
- gem 'rspec-rails', '~> 5.0.1'
+ gem 'database_cleaner', '~> 1.7'
+ gem 'factory_bot_rails', '~> 6.1'
+ gem 'rspec-rails', '~> 4.0', '>= 4.0.2'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
- gem 'minitest', '~> 5.11.0'
+ gem 'minitest', '~> 5.11'
# Generate Fake data
gem 'ffaker', '~> 2.10'
- gem 'spring', '~> 2.1.0'
- gem 'spring-commands-rspec', '~> 1.0.4'
+ gem 'spring', '~> 2.1'
+ gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
- gem 'gitlab-styles', '~> 6.2.0', require: false
+ gem 'gitlab-styles', '~> 6.2', require: false
gem 'haml_lint', '~> 0.36.0', require: false
gem 'bundler-audit', '~> 0.7.0.1', require: false
- gem 'benchmark-ips', '~> 2.3.0', require: false
+ gem 'benchmark-ips', '~> 2.3', require: false
- gem 'knapsack', '~> 1.21.1'
+ gem 'knapsack', '~> 1.21', '>= 1.21.1'
gem 'crystalball', '~> 0.7.0', require: false
- gem 'simple_po_parser', '~> 1.1.2', require: false
+ gem 'simple_po_parser', '~> 1.1', '>= 1.1.2', require: false
gem 'timecop', '~> 0.9.1'
@@ -408,18 +408,18 @@
gem 'lefthook', '~> 0.7.0', require: false
@@ -410,18 +410,18 @@
end
group :test do
@ -456,7 +408,7 @@ gitlab Gemfile
gem 'rails-controller-testing'
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.12.0'
@@ -438,7 +438,7 @@
@@ -440,7 +440,7 @@
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
@ -465,7 +417,7 @@ gitlab Gemfile
gem 'stackprof', '~> 0.2.15', require: false
gem 'rbtrace', '~> 0.4', require: false
gem 'memory_profiler', '~> 0.9', require: false
@@ -452,8 +452,8 @@
@@ -454,8 +454,8 @@
gem 'health_check', '~> 3.0'
# System information
@ -476,25 +428,34 @@ gitlab Gemfile
# NTP client
gem 'net-ntp'
@@ -472,14 +472,14 @@
@@ -474,14 +474,14 @@
gem 'spamcheck', '~> 0.1.0'
# Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 14.1.0.pre.rc3'
+gem 'gitaly', '~> 14.1'
-gem 'gitaly', '~> 14.2.0.pre.rc2'
+gem 'gitaly', '~> 14.2'
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.0.2'
-gem 'grpc', '~> 1.30.2'
+gem 'grpc', '~> 1.30','>= 1.30.2'
+gem 'grpc', '~> 1.30', '>= 1.30.2'
-gem 'google-protobuf', '~> 3.17.1'
+gem 'google-protobuf', '~> 3.17','>= 3.17.1'
+gem 'google-protobuf', '~> 3.17', '>= 3.17.1'
gem 'toml-rb', '~> 2.0'
@@ -500,12 +500,12 @@
@@ -489,7 +489,7 @@
gem 'flipper', '~> 0.21.0'
gem 'flipper-active_record', '~> 0.21.0'
gem 'flipper-active_support_cache_store', '~> 0.21.0'
-gem 'unleash', '~> 3.2.2'
+gem 'unleash', '~> 3.2', '>= 3.2.2'
gem 'gitlab-experiment', '~> 0.6.4'
# Structured logging
@@ -502,12 +502,12 @@
# Countries list
gem 'countries', '~> 3.0'
@ -509,13 +470,13 @@ gitlab Gemfile
# Locked as long as quoted-printable encoding issues are not resolved
# Monkey-patched in `config/initializers/mail_encoding_patch.rb`
@@ -520,11 +520,11 @@
@@ -522,11 +522,11 @@
gem 'valid_email', '~> 0.1'
# JSON
-gem 'json', '~> 2.3.0'
+gem 'json', '~> 2.3'
gem 'json_schemer', '~> 0.2.12'
gem 'json_schemer', '~> 0.2.18'
-gem 'oj', '~> 3.10.6'
-gem 'multi_json', '~> 1.14.1'
-gem 'yajl-ruby', '~> 1.4.1', require: 'yajl'

28
debian/patches/0100-remove-development-test.patch vendored
View file

@ -18,13 +18,13 @@ Bundler will fail when it can't find these locally
gem 'batch-loader', '~> 2.0', '>= 2.0.1'
@@ -335,19 +333,6 @@
gem 'webrick', '~> 1.6','>= 1.6.1', require: false
gem 'prometheus-client-mmap', '~> 0.12.0', require: 'prometheus/client'
@@ -337,19 +335,6 @@
gem 'warning', '~> 1.2'
-group :development do
- gem 'lefthook', '~> 0.7.0', require: false
- gem 'solargraph', '~> 0.42', require: false
- gem 'solargraph', '~> 0.43', require: false
-
- gem 'letter_opener_web', '~> 1.4.0'
-
@ -36,26 +36,26 @@ Bundler will fail when it can't find these locally
-end
-
group :development, :test do
gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false
gem 'bullet', '~> 6.1', '>= 6.1.3'
@@ -370,11 +355,6 @@
gem 'spring', '~> 2.1'
gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
gem 'deprecation_toolkit', '~> 1.5.1', require: false
gem 'bullet', '~> 6.1.3'
@@ -372,11 +357,6 @@
gem 'spring', '~> 2.1.0'
gem 'spring-commands-rspec', '~> 1.0.4'
- gem 'gitlab-styles', '~> 6.2', require: false
- gem 'gitlab-styles', '~> 6.2.0', require: false
-
- gem 'haml_lint', '~> 0.36.0', require: false
- gem 'bundler-audit', '~> 0.7.0.1', require: false
-
gem 'benchmark-ips', '~> 2.3', require: false
gem 'benchmark-ips', '~> 2.3.0', require: false
gem 'knapsack', '~> 1.21', '>= 1.21.1'
@@ -393,20 +373,6 @@
gem 'knapsack', '~> 1.21.1'
@@ -395,20 +375,6 @@
gem 'test_file_finder', '~> 0.1.3'
end
-group :development, :test, :danger do
- gem 'gitlab-dangerfiles', '~> 2.2.2', require: false
- gem 'gitlab-dangerfiles', '~> 2.3.0', require: false
-end
-
-group :development, :test, :coverage do

12
debian/patches/0110-make-test-dependencies-conditional.patch vendored
View file

@ -2,16 +2,16 @@ Make test dependencies conditional so we can enable them when running autopkgtes
--- a/Gemfile
+++ b/Gemfile
@@ -333,7 +333,7 @@
gem 'webrick', '~> 1.6','>= 1.6.1', require: false
gem 'prometheus-client-mmap', '~> 0.12.0', require: 'prometheus/client'
@@ -335,7 +335,7 @@
gem 'warning', '~> 1.2'
-group :development, :test do
+if ENV["INCLUDE_TEST_DEPENDS"] == "true"
gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false
gem 'bullet', '~> 6.1', '>= 6.1.3'
gem 'deprecation_toolkit', '~> 1.5.1', require: false
gem 'bullet', '~> 6.1.3'
gem 'pry-byebug'
@@ -371,9 +371,7 @@
@@ -373,9 +373,7 @@
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
gem 'test_file_finder', '~> 0.1.3'

2
debian/patches/0350-relax-rdoc.patch vendored
View file

@ -10,4 +10,4 @@ Allow rdoc from ruby 2.5 to match requirement
+gem 'rdoc', '~> 6.0'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
gem 'wikicloth', '~> 0.8.1'

2
debian/patches/0499-10-relax-capybara.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -371,7 +371,7 @@
@@ -373,7 +373,7 @@
gem 'rspec_profiling', '~> 0.0.6'
gem 'rspec-parameterized', require: false

2
debian/patches/0499-20-remove-capybara-screenshot.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -372,7 +372,6 @@
@@ -374,7 +374,6 @@
gem 'rspec-parameterized', require: false
gem 'capybara', '~> 3.12'

2
debian/patches/0499-30-remove-guard-rspec.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -381,7 +381,6 @@
@@ -383,7 +383,6 @@
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.12.0'
gem 'rspec_junit_formatter'

13
debian/patches/0499-93-relax-autoprefixer-rails.patch vendored
View file

@ -1,13 +0,0 @@
autoprefixer-rails 10.3 in unstable is broken
--- a/Gemfile
+++ b/Gemfile
@@ -281,7 +281,7 @@
gem 'rack-proxy', '~> 0.6.0'
gem 'sassc-rails', '~> 2.1'
-gem 'autoprefixer-rails', '10.2.5.1'
+gem 'autoprefixer-rails', '~> 10.2'
gem 'terser', '~> 1.0','>= 1.0.2'
gem 'addressable', '~> 2.8'

2
debian/patches/0500-set-webpack-root.patch vendored
View file

@ -2,7 +2,7 @@ Debian specific patch to help webpack find sources
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -24,7 +24,7 @@
@@ -25,7 +25,7 @@
const MonacoWebpackPlugin = require('./plugins/monaco_webpack');

10
debian/patches/0510-remove-dev-dependencies.patch vendored
View file

@ -2,7 +2,7 @@ These are not required in production
--- a/package.json
+++ b/package.json
@@ -200,71 +200,6 @@
@@ -204,72 +204,7 @@
"xterm": "3.14.5"
},
"devDependencies": {
@ -18,7 +18,7 @@ These are not required in production
- "babel-plugin-istanbul": "^6.0.0",
- "chalk": "^2.4.1",
- "cheerio": "^1.0.0-rc.9",
- "commander": "^2.18.0",
- "commander": "^2.20.3",
- "custom-jquery-matchers": "^2.1.0",
- "docdash": "^1.0.2",
- "eslint": "7.31.0",
@ -70,7 +70,9 @@ These are not required in production
- "webpack-dev-server": "^3.11.2",
- "xhr-mock": "^2.5.1",
- "yarn-check-webpack-plugin": "^1.2.0",
- "yarn-deduplicate": "^1.1.1"
},
- "yarn-deduplicate": "^3.1.0"
- },
+ },
"blockedDependencies": {
"bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.html#bootstrapvue"
},

24
debian/patches/0510-remove-manual-resolution-for-monaco-editor.patch vendored
View file

@ -1,24 +0,0 @@
This is removed in newer versions already.
Bug, Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=995572
--- a/package.json
+++ b/package.json
@@ -148,7 +148,7 @@
"mathjax": "3",
"mermaid": "^8.10.2",
"minimatch": "^3.0.4",
- "monaco-editor": "^0.25.2",
+ "monaco-editor": "^0.26.1",
"monaco-editor-webpack-plugin": "^4.0.0",
"monaco-yaml": "^2.5.1",
"mousetrap": "1.6.5",
@@ -270,8 +270,7 @@
"bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.html#bootstrapvue"
},
"resolutions": {
- "chokidar": "^3.4.0",
- "monaco-editor": "0.24.0"
+ "chokidar": "^3.4.0"
},
"engines": {
"node": ">=10.13.0",

4
debian/patches/0660-fix-gitlab-yml-path.patch vendored
View file

@ -2,8 +2,8 @@ Fix for debian package layout
--- a/config/settings.rb
+++ b/config/settings.rb
@@ -10,7 +10,7 @@
require_dependency File.expand_path('../lib/gitlab', __dir__)
@@ -4,7 +4,7 @@
require 'digest/md5'
class Settings < Settingslogic
- source ENV.fetch('GITLAB_CONFIG') { Pathname.new(File.expand_path('..', __dir__)).join('config/gitlab.yml') }

26
debian/patches/0740-use-packaged-modules.patch vendored
View file

@ -27,7 +27,7 @@ Use debian packaged node modules when available
const { StatsWriterPlugin } = require('webpack-stats-plugin');
const WEBPACK_VERSION = require('webpack/package.json').version;
@@ -198,6 +197,8 @@
@@ -217,6 +216,8 @@
entry: generateEntries,
@ -36,7 +36,7 @@ Use debian packaged node modules when available
output: {
path: WEBPACK_OUTPUT_PATH,
publicPath: WEBPACK_PUBLIC_PATH,
@@ -207,10 +208,15 @@
@@ -226,10 +227,15 @@
},
resolve: {
@ -53,7 +53,7 @@ Use debian packaged node modules when available
module: {
strictExportPresence: true,
rules: [
@@ -221,9 +227,13 @@
@@ -240,9 +246,13 @@
},
{
test: /\.js$/,
@ -68,7 +68,7 @@ Use debian packaged node modules when available
loader: 'babel-loader',
options: {
cacheDirectory: path.join(CACHE_PATH, 'babel-loader'),
@@ -310,7 +320,7 @@
@@ -329,7 +339,7 @@
},
{
test: /\.(eot|ttf|woff|woff2)$/,
@ -77,7 +77,7 @@ Use debian packaged node modules when available
loader: 'file-loader',
options: {
name: '[name].[contenthash:8].[ext]',
@@ -601,19 +611,6 @@
@@ -620,19 +630,6 @@
// enable HMR only in webpack-dev-server
DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
@ -97,7 +97,7 @@ Use debian packaged node modules when available
new webpack.DefinePlugin({
// This one is used to define window.gon.ee and other things properly in tests:
'process.env.IS_EE': JSON.stringify(IS_EE),
@@ -650,6 +647,7 @@
@@ -669,6 +666,7 @@
node: {
fs: 'empty', // sqljs requires fs
@ -125,16 +125,16 @@ Use debian packaged node modules when available
+ "@babel/preset-env": "link:/usr/share/nodejs/@babel/preset-env",
"@gitlab/at.js": "1.5.7",
"@gitlab/favicon-overlay": "2.0.0",
"@gitlab/svgs": "1.202.0",
"@gitlab/svgs": "1.211.0",
"@gitlab/tributejs": "1.0.0",
"@gitlab/ui": "31.5.0",
"@gitlab/ui": "32.2.1",
"@gitlab/visual-review-tools": "1.6.1",
- "@rails/actioncable": "6.1.3-2",
+ "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
"@rails/ujs": "6.1.3-2",
"@sentry/browser": "5.26.0",
"@sourcegraph/code-host-integration": "0.0.58",
@@ -103,7 +103,7 @@
"@sourcegraph/code-host-integration": "0.0.59",
@@ -107,7 +107,7 @@
"aws-sdk": "^2.637.0",
"axios": "^0.20.0",
"babel-loader": "^8.2.2",
@ -143,7 +143,7 @@ Use debian packaged node modules when available
"bootstrap": "4.5.3",
"cache-loader": "^4.1.0",
"clipboard": "^1.7.1",
@@ -137,30 +137,30 @@
@@ -141,30 +141,30 @@
"jquery": "^3.6.0",
"jquery.caret": "^0.3.1",
"jquery.waitforimages": "^2.2.0",
@ -165,7 +165,7 @@ Use debian packaged node modules when available
"mermaid": "^8.10.2",
- "minimatch": "^3.0.4",
+ "minimatch": "link:/usr/share/nodejs/minimatch",
"monaco-editor": "^0.26.1",
"monaco-editor": "^0.25.2",
"monaco-editor-webpack-plugin": "^4.0.0",
"monaco-yaml": "^2.5.1",
"mousetrap": "1.6.5",
@ -185,7 +185,7 @@ Use debian packaged node modules when available
"prosemirror-state": "^1.3.4",
"raphael": "^2.2.7",
"raw-loader": "^4.0.2",
@@ -173,27 +173,26 @@
@@ -177,27 +177,26 @@
"style-loader": "^2.0.0",
"swagger-ui-dist": "^3.44.1",
"three": "^0.84.0",

11
debian/patches/0750-fix-relative-paths.patch vendored
View file

@ -25,14 +25,3 @@ Debian specific patch to adapt to debian policy mandated paths
# Initialize the Rails application.
Rails.application.initialize!
--- a/config/settings.rb
+++ b/config/settings.rb
@@ -7,7 +7,7 @@
# full Rails environment being loaded. We can not use `require_relative` either,
# as Rails uses `load` for `require_dependency` (used when loading the Rails
# environment). This could then lead to this file being loaded twice.
-require_dependency File.expand_path('../lib/gitlab', __dir__)
+require ('/usr/share/gitlab/lib/gitlab')
class Settings < Settingslogic
source ENV.fetch('GITLAB_CONFIG') { Pathname.new(File.expand_path('gitlab.yml', __dir__)) }

2
debian/patches/series vendored
View file

@ -14,9 +14,7 @@
0499-30-remove-guard-rspec.patch
0499-70-relax-graphlient.patch
0499-92-relax-rexml.patch
0499-93-relax-autoprefixer-rails.patch
0500-set-webpack-root.patch
0510-remove-manual-resolution-for-monaco-editor.patch
0510-remove-dev-dependencies.patch
0610-source-init-functions.patch
0630-fix-mail-room-path.patch