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 2020-04-22 19:44:27 +05:30
parent 0fb65a92ab
commit 67a60267e7
12 changed files with 684 additions and 273 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -111,8 +111,8 @@ gitlab Gemfile
+gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors'
# GraphQL API
-gem 'graphql', '~> 1.9.19'
+gem 'graphql', '~> 1.9', '>= 1.9.19'
-gem 'graphql', '~> 1.10.5'
+gem 'graphql', '~> 1.10', '>= 1.10.5'
# NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771
# TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released:
# https://gitlab.com/gitlab-org/gitlab/issues/31747
@ -151,12 +151,14 @@ gitlab Gemfile
# Search
gem 'elasticsearch-model', '~> 6.1'
@@ -138,21 +138,21 @@
@@ -137,22 +137,22 @@
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.12'
gem 'deckar01-task_list', '2.3.1'
-gem 'deckar01-task_list', '2.3.1'
-gem 'gitlab-markup', '~> 1.7.0'
-gem 'github-markup', '~> 1.7.0', require: 'github/markup'
+gem 'deckar01-task_list', '~> 2.3', '>= 2.3.1'
+gem 'gitlab-markup', '~> 1.7'
+gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.20'
@ -171,8 +173,8 @@ gitlab Gemfile
+gem 'asciidoctor', '~> 2.0', '>= 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
gem 'asciidoctor-plantuml', '0.0.10'
-gem 'rouge', '~> 3.17.0'
+gem 'rouge', '~> 3.17'
-gem 'rouge', '~> 3.18.0'
+gem 'rouge', '~> 3.18'
gem 'truncato', '~> 0.7.11'
-gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.10.5'
@ -302,7 +304,7 @@ gitlab Gemfile
+gem 'premailer-rails', '~> 1.10', '>= 1.10.3'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '0.11.0'
gem 'gitlab-labkit', '0.12.0'
@@ -306,11 +306,11 @@
# I18n
gem 'ruby_parser', '~> 3.8', require: false
@ -329,8 +331,9 @@ gitlab Gemfile
gem 'awesome_print', require: false
- gem 'database_cleaner', '~> 1.7.0'
- gem 'factory_bot_rails', '~> 5.1.0'
+ gem 'database_cleaner', '~> 1.7'
gem 'factory_bot_rails', '~> 5.1.0'
+ gem 'factory_bot_rails', '~> 5.1'
gem 'rspec-rails', '~> 4.0.0.beta4'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
@ -345,8 +348,8 @@ gitlab Gemfile
+ gem 'spring', '~> 2.0'
+ gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
- gem 'gitlab-styles', '~> 3.1.0', require: false
+ gem 'gitlab-styles', '~> 3.1', require: false
- gem 'gitlab-styles', '~> 3.2.0', require: false
+ gem 'gitlab-styles', '~> 3.2', require: false
# Pin these dependencies, otherwise a new rule could break the CI pipelines
- gem 'rubocop', '~> 0.74.0'
- gem 'rubocop-performance', '~> 1.4.1'
@ -370,7 +373,7 @@ gitlab Gemfile
gem 'timecop', '~> 0.9.1'
@@ -396,20 +396,20 @@
@@ -396,19 +396,19 @@
end
group :test do
@ -378,21 +381,18 @@ gitlab Gemfile
+ gem 'fuubar', '~> 2.2'
gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_profiling', '~> 0.0.5'
gem 'rspec-set', '~> 0.1.3'
gem 'rspec-parameterized', require: false
- gem 'capybara', '~> 3.22.0'
- gem 'capybara-screenshot', '~> 1.0.22'
- gem 'selenium-webdriver', '~> 3.142'
-
+ gem 'capybara', '~> 3.22'
+ gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
gem 'selenium-webdriver', '~> 3.142'
- gem 'shoulda-matchers', '~> 4.0.1', require: false
- gem 'email_spec', '~> 2.2.0'
- gem 'json-schema', '~> 2.8.0'
- gem 'webmock', '~> 3.5.1'
+ gem 'capybara', '~> 3.22'
+ gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
+ gem 'selenium-webdriver', '~> 3.1', '>= 3.142'
+
+ gem 'shoulda-matchers', '~> 4.0', '>= 4.0.1', require: false
+ gem 'email_spec', '~> 2.2'
+ gem 'json-schema', '~> 2.8'
@ -400,16 +400,16 @@ gitlab Gemfile
gem 'rails-controller-testing'
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.10.0'
@@ -425,7 +425,7 @@
@@ -424,7 +424,7 @@
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
-gem 'ruby-prof', '~> 1.0.0'
+gem 'ruby-prof', '~> 1.0'
-gem 'ruby-prof', '~> 1.3.0'
+gem 'ruby-prof', '~> 1.3'
gem 'stackprof', '~> 0.2.15', require: false
gem 'rbtrace', '~> 0.4', require: false
gem 'memory_profiler', '~> 0.9', require: false
@@ -436,11 +436,11 @@
@@ -435,11 +435,11 @@
gem 'oauth2', '~> 1.4'
# Health check
@ -424,7 +424,7 @@ gitlab Gemfile
# NTP client
gem 'net-ntp'
@@ -458,11 +458,11 @@
@@ -457,11 +457,11 @@
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 12.9.0.pre.rc4'
@ -439,7 +439,7 @@ gitlab Gemfile
# Feature toggles
gem 'flipper', '~> 0.17.1'
@@ -480,14 +480,14 @@
@@ -479,14 +479,14 @@
# Countries list
gem 'countries', '~> 3.0'

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

@ -42,11 +42,11 @@ Bundler will fail when it can't find these locally
gem 'pry-byebug', '~> 3.5','>= 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.9'
@@ -366,16 +348,7 @@
@@ -366,16 +348,6 @@
gem 'spring', '~> 2.0'
gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
- gem 'gitlab-styles', '~> 3.1', require: false
- gem 'gitlab-styles', '~> 3.2', require: false
- # Pin these dependencies, otherwise a new rule could break the CI pipelines
- gem 'rubocop', '~> 0.74'
- gem 'rubocop-performance', '~> 1.4', '>= 1.4.1'
@ -54,12 +54,12 @@ Bundler will fail when it can't find these locally
-
- gem 'scss_lint', '~> 0.56.0', require: false
- gem 'haml_lint', '~> 0.34.0', require: false
gem 'simplecov', '~> 0.18.5', require: false
- gem 'simplecov', '~> 0.18.5', require: false
- gem 'bundler-audit', '~> 0.6.1', require: false
gem 'benchmark-ips', '~> 2.3', require: false
@@ -390,11 +363,6 @@
@@ -390,11 +362,6 @@
gem 'parallel', '~> 1.19', require: false
end

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

@ -11,7 +11,7 @@ Make test dependencies conditional so we can enable them when running autopkgtes
gem 'pry-byebug', '~> 3.5','>= 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.9'
@@ -361,9 +361,6 @@
@@ -360,9 +360,6 @@
gem 'png_quantizator', '~> 0.2.1', require: false
gem 'parallel', '~> 1.19', require: false

2
debian/patches/0430-remove-gitlab-markup.patch vendored
View file

@ -7,7 +7,7 @@ maintaining two almost same packages.
@@ -137,7 +137,6 @@
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.12'
gem 'deckar01-task_list', '2.3.1'
gem 'deckar01-task_list', '~> 2.3', '>= 2.3.1'
-gem 'gitlab-markup', '~> 1.7'
gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.20'

14
debian/patches/0460-embed-derailed-benchmarks.patch vendored
View file

@ -1,14 +0,0 @@
Embed this gem until it is packaged
--- a/Gemfile
+++ b/Gemfile
@@ -310,7 +310,8 @@
gem 'snowplow-tracker', '~> 0.6.1'
# Memory benchmarks
-gem 'gitlab-derailed_benchmarks', require: false
+gem 'gitlab-derailed_benchmarks', require: false, path: 'vendor/gems/derailed-benchmarks'
+gem 'heapy', require: false
# Metrics
group :metrics do

2
debian/patches/0484-relax-asciidoctor-plantuml.patch vendored
View file

@ -8,6 +8,6 @@ Allow newer patch releases to match requirement
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
-gem 'asciidoctor-plantuml', '0.0.10'
+gem 'asciidoctor-plantuml', '~> 0.0.10'
gem 'rouge', '~> 3.17'
gem 'rouge', '~> 3.18'
gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2'

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

@ -2,12 +2,12 @@ These are not required in production
--- a/package.json
+++ b/package.json
@@ -145,65 +145,7 @@
@@ -144,65 +144,7 @@
"xterm": "^3.5.0"
},
"devDependencies": {
- "@babel/plugin-transform-modules-commonjs": "^7.8.3",
- "@gitlab/eslint-config": "^3.0.0",
- "@gitlab/eslint-plugin": "2.2.1",
- "@vue/test-utils": "^1.0.0-beta.30",
- "axios-mock-adapter": "^1.15.0",
- "babel-jest": "^24.1.0",
@ -69,10 +69,3 @@ These are not required in production
"blockedDependencies": {
"bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.md#bootstrapvue"
},
@@ -215,4 +157,4 @@
"node": ">=10.13.0",
"yarn": "^1.10.0"
}
-}
\ No newline at end of file
+}

2
debian/patches/0610-source-init-functions.patch vendored
View file

@ -14,7 +14,7 @@ Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/12954
### Environment variables
RAILS_ENV="production"
@@ -39,7 +42,7 @@
sidekiq_pid_path="$pid_path/sidekiq.pid"
web_server_pid_path="$pid_path/unicorn.pid"
mail_room_enabled=false
mail_room_pid_path="$pid_path/mail_room.pid"
-gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse 2> /dev/null && pwd)

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

@ -75,7 +75,7 @@ Use debian packaged node modules when available
};
--- a/package.json
+++ b/package.json
@@ -49,63 +49,40 @@
@@ -49,62 +49,39 @@
"apollo-link": "^1.2.11",
"apollo-link-batch-http": "^1.2.11",
"apollo-upload-client": "^10.0.0",
@ -96,8 +96,7 @@ Use debian packaged node modules when available
- "core-js": "^3.6.4",
"cropper": "^2.3.0",
- "css-loader": "^1.0.0",
- "d3": "^4.13.0",
- "d3-scale": "^1.0.7",
- "d3-scale": "^2.2.2",
- "d3-selection": "^1.2.0",
- "dateformat": "^3.0.3",
- "deckar01-task_list": "^2.3.1",
@ -112,7 +111,6 @@ Use debian packaged node modules when available
"fuzzaldrin-plus": "^0.6.0",
"glob": "^7.1.6",
"graphql": "^14.0.2",
+ "graphql-tag": "^2.0.0",
"immer": "^5.2.1",
- "imports-loader": "^0.8.0",
- "jed": "^1.1.1",
@ -140,7 +138,7 @@ Use debian packaged node modules when available
"raphael": "^2.2.7",
"raw-loader": "^4.0.0",
"sanitize-html": "^1.22.0",
@@ -118,16 +95,11 @@
@@ -117,16 +94,11 @@
"svg4everybody": "2.1.9",
"swagger-ui-dist": "^3.24.3",
"three": "^0.84.0",
@ -157,7 +155,7 @@ Use debian packaged node modules when available
"visibilityjs": "^1.2.4",
"vue": "^2.6.10",
"vue-apollo": "^3.0.0-beta.28",
@@ -137,12 +109,7 @@
@@ -136,12 +108,7 @@
"vue-virtual-scroll-list": "^1.4.4",
"vuedraggable": "^2.23.0",
"vuex": "^3.1.0",

855
debian/patches/0760-update-grape.patch vendored
View file

File diff suppressed because it is too large Load diff

2
debian/patches/0790-protobuf-compat.patch vendored
View file

@ -9,7 +9,7 @@ Subject: [PATCH 2/2] Fix protobuf compatibility (Thanks to Stan Hu)
--- a/lib/api/helpers/internal_helpers.rb
+++ b/lib/api/helpers/internal_helpers.rb
@@ -110,7 +110,7 @@
@@ -117,7 +117,7 @@
return unless %w[git-receive-pack git-upload-pack git-upload-archive].include?(action)
{

1
debian/patches/series vendored
View file

@ -6,7 +6,6 @@
0350-relax-method-source.patch
0430-remove-gitlab-markup.patch
0440-remove-puma.patch
0460-embed-derailed-benchmarks.patch
0480-embed-elasticsearch-model.patch
0480-embed-elasticsearch-rails.patch
0480-embed-faraday-middleware-aws-signers-v4.patch