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

Refresh d/patches

Browse source
This commit is contained in:
Utkarsh Gupta 2019-05-18 01:04:41 +05:30
parent b960044a5b
commit 7043a3f3b5
18 changed files with 214 additions and 268 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@ Bundler will fail when it can't find these locally
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -282,7 +282,6 @@ @@ -279,7 +279,6 @@
gem 'rails-i18n', '~> 5.1' gem 'rails-i18n', '~> 5.1'
gem 'gettext_i18n_rails', '~> 1.8' gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext_i18n_rails_js', '~> 1.3'
@ -10,7 +10,7 @@ Bundler will fail when it can't find these locally
gem 'batch-loader', '~> 1.2', '>= 1.2.2' gem 'batch-loader', '~> 1.2', '>= 1.2.2'
@@ -310,21 +309,6 @@ @@ -307,21 +306,6 @@
gem 'jaeger-client', '~> 0.10.0' gem 'jaeger-client', '~> 0.10.0'
end end
@ -30,5 +30,5 @@ Bundler will fail when it can't find these locally
-end -end
- -
group :development, :test do group :development, :test do
gem 'bootsnap', '~> 1.3' gem 'bootsnap', '~> 1.4'
gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET'] gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET']

2
debian/patches/0108-make-mysql-optional.patch vendored
View file

@ -19,5 +19,5 @@ Subject: [PATCH] allow specifying DB choice via ENV variable
+gem 'mysql2', '~> 0.4.10' if ENV["DB"] == "all" || ENV["DB"] == "mysql" +gem 'mysql2', '~> 0.4.10' if ENV["DB"] == "all" || ENV["DB"] == "mysql"
+gem 'pg', '~> 1.1' if ENV["DB"] == "all" || ENV["DB"] == "postgres" +gem 'pg', '~> 1.1' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
gem 'rugged', '~> 0.27' gem 'rugged', '~> 0.28'
gem 'grape-path-helpers', '~> 1.0' gem 'grape-path-helpers', '~> 1.0'

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

@ -1,15 +1,15 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -310,7 +310,7 @@ @@ -307,7 +307,7 @@ group :tracing do
gem 'jaeger-client', '~> 0.10.0' gem 'jaeger-client', '~> 0.10.0'
end end
-group :development, :test do -group :development, :test do
+if ENV["INCLUDE_TEST_DEPENDS"] == "true" +if ENV["INCLUDE_TEST_DEPENDS"] == "true"
gem 'bootsnap', '~> 1.3' gem 'bootsnap', '~> 1.4'
gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET'] gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri
@@ -362,9 +362,9 @@ @@ -359,9 +359,9 @@ group :development, :test do
gem 'simple_po_parser', '~> 1.1', '>= 1.1.2', require: false gem 'simple_po_parser', '~> 1.1', '>= 1.1.2', require: false
gem 'timecop', '~> 0.8.0' gem 'timecop', '~> 0.8.0'

6
debian/patches/0220-relax-webmock.patch vendored
View file

@ -1,11 +1,11 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -368,7 +368,7 @@ @@ -365,7 +365,7 @@ if ENV["INCLUDE_TEST_DEPENDS"] == "true"
gem 'shoulda-matchers', '~> 3.1', '>= 3.1.2', require: false gem 'shoulda-matchers', '~> 3.1', '>= 3.1.2', require: false
gem 'email_spec', '~> 2.2' gem 'email_spec', '~> 2.2'
gem 'json-schema', '~> 2.8' gem 'json-schema', '~> 2.8'
- gem 'webmock', '~> 2.3', '>= 2.3.2' - gem 'webmock', '~> 3.5', '>= 3.5.1'
+ gem 'webmock', '>= 2.3.2' + gem 'webmock', '>= 3.5.1'
gem 'rails-controller-testing' gem 'rails-controller-testing'
gem 'sham_rack', '~> 1.3', '>= 1.3.6' gem 'sham_rack', '~> 1.3', '>= 1.3.6'
gem 'concurrent-ruby', '~> 1.1' gem 'concurrent-ruby', '~> 1.1'

4
debian/patches/0290-skip-peek-mysql2.patch vendored
View file

@ -1,10 +1,10 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -289,7 +289,6 @@ gem 'batch-loader', '~> 1.2', '>= 1.2.2' @@ -286,7 +286,6 @@ gem 'batch-loader', '~> 1.2', '>= 1.2.2'
# Perf bar # Perf bar
gem 'peek', '~> 1.0', '>= 1.0.1' gem 'peek', '~> 1.0', '>= 1.0.1'
gem 'peek-gc', '~> 0.0.2' gem 'peek-gc', '~> 0.0.2'
-gem 'peek-mysql2', '~> 1.2', group: :mysq -gem 'peek-mysql2', '~> 1.2', group: :mysql
gem 'peek-pg', '~> 1.3', group: :postgres gem 'peek-pg', '~> 1.3', group: :postgres
gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-rblineprof', '~> 0.2.0'
gem 'peek-redis', '~> 1.2' gem 'peek-redis', '~> 1.2'

6
debian/patches/0340-relax-httparty.patch vendored
View file

@ -1,11 +1,11 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -169,7 +169,7 @@ @@ -168,7 +168,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
gem 'fugit', '~> 1.1' gem 'fugit', '~> 1.1'
# HTTP requests # HTTP requests
-gem 'httparty', '~> 0.13.3' -gem 'httparty', '~> 0.16.4'
+gem 'httparty', '~> 0.13' +gem 'httparty', '~> 0.16'
# Colored output to console # Colored output to console
gem 'rainbow', '~> 3.0' gem 'rainbow', '~> 3.0'

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

@ -1,10 +1,10 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -115,7 +115,6 @@ @@ -117,7 +117,6 @@ gem 'seed-fu', '~> 2.3', '>= 2.3.7'
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 2.8' gem 'html-pipeline', '~> 2.8'
gem 'deckar01-task_list', '2.0' gem 'deckar01-task_list', '~> 2.2'
-gem 'gitlab-markup', '~> 1.6', '>= 1.6.5' -gem 'gitlab-markup', '~> 1.7'
gem 'github-markup', '~> 1.7', require: 'github/markup' gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.17' gem 'commonmarker', '~> 0.17'
gem 'RedCloth', '~> 4.3', '>= 4.3.2' gem 'RedCloth', '~> 4.3', '>= 4.3.2'

2
debian/patches/0440-remove-puma.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -147,11 +147,6 @@ @@ -146,11 +146,6 @@
gem 'unicorn-worker-killer', '~> 0.4.4' gem 'unicorn-worker-killer', '~> 0.4.4'
end end

4
debian/patches/0450-remove-bullet.patch vendored
View file

@ -1,9 +1,9 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -305,7 +305,6 @@ @@ -302,7 +302,6 @@ end
if ENV["INCLUDE_TEST_DEPENDS"] == "true" if ENV["INCLUDE_TEST_DEPENDS"] == "true"
gem 'bootsnap', '~> 1.3' gem 'bootsnap', '~> 1.4'
- gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET'] - gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.4' gem 'pry-rails', '~> 0.3.4'

4
debian/patches/0490-relax-nokogiri.patch vendored
View file

@ -1,9 +1,9 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -127,7 +127,7 @@ @@ -129,7 +129,7 @@ gem 'asciidoctor-plantuml', '0.0.8'
gem 'rouge', '~> 3.1' gem 'rouge', '~> 3.1'
gem 'truncato', '~> 0.7.11' gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 2.7' gem 'bootstrap_form', '~> 4.2'
-gem 'nokogiri', '~> 1.10', '>= 1.10.1' -gem 'nokogiri', '~> 1.10', '>= 1.10.1'
+gem 'nokogiri', '~> 1.10' +gem 'nokogiri', '~> 1.10'
gem 'escape_utils', '~> 1.1' gem 'escape_utils', '~> 1.1'

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

@ -1,22 +1,20 @@
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -126,52 +126,6 @@ @@ -138,58 +138,6 @@
"xterm": "^3.5.0" "xterm": "^3.5.0"
}, },
"devDependencies": { "devDependencies": {
- "@gitlab/eslint-config": "^1.4.0", - "@babel/plugin-transform-modules-commonjs": "^7.2.0",
- "@gitlab/eslint-config": "^1.5.0",
- "@vue/test-utils": "^1.0.0-beta.25", - "@vue/test-utils": "^1.0.0-beta.25",
- "axios-mock-adapter": "^1.15.0", - "axios-mock-adapter": "^1.15.0",
- "babel-core": "^7.0.0-bridge", - "babel-jest": "^24.1.0",
- "babel-jest": "^23.6.0",
- "babel-plugin-dynamic-import-node": "^2.2.0", - "babel-plugin-dynamic-import-node": "^2.2.0",
- "babel-plugin-istanbul": "^5.1.0", - "babel-plugin-istanbul": "^5.1.0",
- "babel-plugin-rewire": "^1.2.0", - "babel-plugin-rewire": "^1.2.0",
- "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
- "babel-template": "^6.26.0",
- "babel-types": "^6.26.0",
- "chalk": "^2.4.1", - "chalk": "^2.4.1",
- "commander": "^2.18.0", - "commander": "^2.18.0",
- "custom-jquery-matchers": "^2.1.0",
- "docdash": "^1.0.2", - "docdash": "^1.0.2",
- "eslint": "~5.9.0", - "eslint": "~5.9.0",
- "eslint-import-resolver-jest": "^2.1.1", - "eslint-import-resolver-jest": "^2.1.1",
@ -24,16 +22,18 @@
- "eslint-plugin-html": "5.0.0", - "eslint-plugin-html": "5.0.0",
- "eslint-plugin-import": "^2.14.0", - "eslint-plugin-import": "^2.14.0",
- "eslint-plugin-jasmine": "^2.10.1", - "eslint-plugin-jasmine": "^2.10.1",
- "eslint-plugin-jest": "^22.1.0", - "eslint-plugin-jest": "^22.3.0",
- "gettext-extractor": "^3.3.2", - "gettext-extractor": "^3.4.3",
- "gettext-extractor-vue": "^4.0.1", - "gettext-extractor-vue": "^4.0.2",
- "graphql-tag": "^2.10.0", - "graphql-tag": "^2.10.0",
- "istanbul": "^0.4.5", - "istanbul": "^0.4.5",
- "jasmine-core": "^2.9.0", - "jasmine-core": "^2.9.0",
- "jasmine-diff": "^0.1.3", - "jasmine-diff": "^0.1.3",
- "jasmine-jquery": "^2.1.1", - "jasmine-jquery": "^2.1.1",
- "jest": "^23.6.0", - "jest": "^24.1.0",
- "jest-junit": "^5.2.0", - "jest-environment-jsdom": "^24.0.0",
- "jest-junit": "^6.3.0",
- "jest-util": "^24.0.0",
- "jsdoc": "^3.5.5", - "jsdoc": "^3.5.5",
- "jsdoc-vue": "^1.0.0", - "jsdoc-vue": "^1.0.0",
- "karma": "^3.0.0", - "karma": "^3.0.0",
@ -44,12 +44,18 @@
- "karma-mocha-reporter": "^2.2.5", - "karma-mocha-reporter": "^2.2.5",
- "karma-sourcemap-loader": "^0.3.7", - "karma-sourcemap-loader": "^0.3.7",
- "karma-webpack": "^4.0.0-beta.0", - "karma-webpack": "^4.0.0-beta.0",
- "md5": "^2.2.1",
- "node-sass": "^4.11.0",
- "nodemon": "^1.18.9", - "nodemon": "^1.18.9",
- "pixelmatch": "^4.0.2", - "pixelmatch": "^4.0.2",
- "prettier": "1.16.1", - "postcss": "^7.0.14",
- "vue-jest": "^3.0.2", - "prettier": "1.16.4",
- "stylelint": "^9.10.1",
- "stylelint-config-recommended": "^2.1.0",
- "stylelint-scss": "^3.5.4",
- "vue-jest": "^4.0.0-beta.2",
- "webpack-dev-server": "^3.1.14", - "webpack-dev-server": "^3.1.14",
- "yarn-deduplicate": "^1.1.0" - "yarn-deduplicate": "^1.1.1"
}, },
"engines": { "resolutions": {
"node": ">=8.10.0", "vue-jest/ts-jest": "24.0.0"

8
debian/patches/0520-add-system-lib-path-for-webpack.patch vendored
View file

@ -1,15 +1,11 @@
--- a/config/webpack.config.js --- a/config/webpack.config.js
+++ b/config/webpack.config.js +++ b/config/webpack.config.js
@@ -85,6 +85,7 @@ @@ -119,9 +119,14 @@ module.exports = {
resolve: { resolve: {
extensions: ['.js', '.gql', '.graphql'], extensions: ['.js', '.gql', '.graphql'],
+ modules: ['/usr/share/gitlab/node_modules','/usr/share/gitlab/node_modules/mermaid/node_modules', '/usr/lib/nodejs'], + modules: ['/usr/share/gitlab/node_modules','/usr/share/gitlab/node_modules/mermaid/node_modules', '/usr/lib/nodejs'],
alias: { alias,
'~': path.join(ROOT_PATH, 'app/assets/javascripts'),
emojis: path.join(ROOT_PATH, 'fixtures/emojis'),
@@ -100,6 +101,10 @@
},
}, },
+ resolveLoader: { + resolveLoader: {

4
debian/patches/0640-relax-ruby-version.patch vendored
View file

@ -2,11 +2,11 @@ Debian's ruby has the latest security patches applied
--- a/lib/system_check/app/ruby_version_check.rb --- a/lib/system_check/app/ruby_version_check.rb
+++ b/lib/system_check/app/ruby_version_check.rb +++ b/lib/system_check/app/ruby_version_check.rb
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@ module SystemCheck
set_check_pass -> { "yes (#{self.current_version})" } set_check_pass -> { "yes (#{self.current_version})" }
def self.required_version def self.required_version
- @required_version ||= Gitlab::VersionInfo.new(2, 3, 5) - @required_version ||= Gitlab::VersionInfo.new(2, 5, 3)
+ @required_version ||= Gitlab::VersionInfo.new(2, 3, 3) + @required_version ||= Gitlab::VersionInfo.new(2, 3, 3)
end end

365
debian/patches/0680-rails-5_1.patch vendored
View file

File diff suppressed because it is too large Load diff

2
debian/patches/0687-opentracing-embed.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -309,7 +309,7 @@ @@ -306,7 +306,7 @@
group :tracing do group :tracing do
# OpenTracing # OpenTracing

2
debian/patches/0688-jaeger-client-embed.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -310,7 +310,8 @@ @@ -307,7 +307,8 @@
group :tracing do group :tracing do
# OpenTracing # OpenTracing
gem 'opentracing', '0.4.3', path: 'vendor/gems/opentracing-0.4.3' gem 'opentracing', '0.4.3', path: 'vendor/gems/opentracing-0.4.3'

6
debian/patches/0689-jwt-and-omniauth-google-oauth2.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@ gem 'omniauth-cas3', '~> 1.1', '>= 1.1.4'
gem 'omniauth-facebook', '~> 4.0' gem 'omniauth-facebook', '~> 4.0'
gem 'omniauth-github', '~> 1.3' gem 'omniauth-github', '~> 1.3'
gem 'omniauth-gitlab', '~> 1.0', '>= 1.0.2' gem 'omniauth-gitlab', '~> 1.0', '>= 1.0.2'
@ -9,10 +9,10 @@
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-oauth2-generic', '~> 0.2.2'
gem 'omniauth-saml', '~> 1.10' gem 'omniauth-saml', '~> 1.10'
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@ gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.2' gem 'omniauth_crowd', '~> 2.2'
gem 'omniauth-authentiq', '~> 0.3.3' gem 'omniauth-authentiq', '~> 0.3.3'
gem 'rack-oauth2', '~> 1.2', '>= 1.2.1' gem 'rack-oauth2', '~> 1.9', '>= 1.9.3'
-gem 'jwt', '~> 2.1' -gem 'jwt', '~> 2.1'
+gem 'jwt', '2.1', path: 'vendor/gems/jwt-2.1.0' +gem 'jwt', '2.1', path: 'vendor/gems/jwt-2.1.0'

9
debian/patches/series vendored
View file

@ -5,12 +5,12 @@
0220-relax-webmock.patch 0220-relax-webmock.patch
0290-skip-peek-mysql2.patch 0290-skip-peek-mysql2.patch
0340-relax-httparty.patch 0340-relax-httparty.patch
0400-Relax-recaptcha-version.patch #0400-Relax-recaptcha-version.patch
0430-remove-gitlab-markup.patch 0430-remove-gitlab-markup.patch
0440-remove-puma.patch 0440-remove-puma.patch
0450-remove-bullet.patch 0450-remove-bullet.patch
0470-relax-rails.patch 0470-relax-rails.patch
0480-relax-acts-as-taggable-on.patch #0480-relax-acts-as-taggable-on.patch
0490-relax-nokogiri.patch 0490-relax-nokogiri.patch
0500-set-webpack-root.patch 0500-set-webpack-root.patch
0510-remove-dev-dependencies.patch 0510-remove-dev-dependencies.patch
@ -22,8 +22,8 @@
0660-fix-gitlab-yml-path.patch 0660-fix-gitlab-yml-path.patch
0670-allow-doorkeepr-4_3.patch 0670-allow-doorkeepr-4_3.patch
0680-rails-5_1.patch 0680-rails-5_1.patch
0680-rails-5-migrations.patch #0680-rails-5-migrations.patch
0685-bump-fog.patch #0685-bump-fog.patch
0686-rails-5.1-embed.patch 0686-rails-5.1-embed.patch
0687-opentracing-embed.patch 0687-opentracing-embed.patch
0688-jaeger-client-embed.patch 0688-jaeger-client-embed.patch
@ -31,3 +31,4 @@
0690-debian-usage-ping.patch 0690-debian-usage-ping.patch
0700-add-salsa-link-to-help.patch 0700-add-salsa-link-to-help.patch
0710-use-yarnpkg.patch 0710-use-yarnpkg.patch
0730-install-graphql-tag.patch