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 2019-12-21 21:33:11 +05:30
parent 8ad3f84daf
commit 42c93ca0a5
9 changed files with 29 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -95,9 +95,9 @@ gitlab Gemfile
# GraphQL API
-gem 'graphql', '~> 1.9.11'
+gem 'graphql', '~> 1.9', '>= 1.9.11'
# NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab-ce/issues/67293
# 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-ce/issues/67263
# https://gitlab.com/gitlab-org/gitlab/issues/31747
-gem 'graphiql-rails', '~> 1.4.10'
-gem 'apollo_upload_server', '~> 2.0.0.beta3'
+gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
@ -157,7 +157,7 @@ gitlab Gemfile
+gem 'asciidoctor', '~> 2.0', '>= 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
gem 'asciidoctor-plantuml', '0.0.9'
gem 'rouge', '~> 3.7'
gem 'rouge', '~> 3.11.0'
gem 'truncato', '~> 0.7.11'
-gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.10.4'
@ -306,89 +306,7 @@ gitlab Gemfile
+gem 'batch-loader', '~> 1.4'
# Perf bar
# https://gitlab.com/gitlab-org/gitlab-ee/issues/13996
@@ -347,62 +347,62 @@
end
group :development, :test do
- gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
- gem 'pry-byebug', '~> 3.5.1', platform: :mri
+ gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET']
+ gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'
gem 'awesome_print', require: false
- gem 'fuubar', '~> 2.2.0'
+ gem 'fuubar', '~> 2.2'
- gem 'database_cleaner', '~> 1.7.0'
- gem 'factory_bot_rails', '~> 4.8.2'
- gem 'rspec-rails', '~> 3.8.0'
+ gem 'database_cleaner', '~> 1.7'
+ gem 'factory_bot_rails', '~> 4.8', '>= 4.8.2'
+ gem 'rspec-rails', '~> 3.8'
gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_profiling', '~> 0.0.5'
gem 'rspec-set', '~> 0.1.3'
gem 'rspec-parameterized', require: false
# 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 'capybara', '~> 3.22.0'
- gem 'capybara-screenshot', '~> 1.0.22'
+ gem 'capybara', '~> 3.22'
+ gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
gem 'selenium-webdriver', '~> 3.141'
- gem 'spring', '~> 2.0.0'
- gem 'spring-commands-rspec', '~> 1.0.4'
+ gem 'spring', '~> 2.0'
+ gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
gem 'gitlab-styles', '~> 2.7', require: false
# Pin these dependencies, otherwise a new rule could break the CI pipelines
gem 'rubocop', '~> 0.69.0'
- gem 'rubocop-performance', '~> 1.1.0'
- gem 'rubocop-rspec', '~> 1.22.1'
+ gem 'rubocop-performance', '~> 1.1'
+ gem 'rubocop-rspec', '~> 1.22', '>= 1.22.1'
gem 'scss_lint', '~> 0.56.0', require: false
gem 'haml_lint', '~> 0.31.0', require: false
gem 'simplecov', '~> 0.16.1', require: false
gem 'bundler-audit', '~> 0.5.0', require: false
- gem 'benchmark-ips', '~> 2.3.0', require: false
+ gem 'benchmark-ips', '~> 2.3', require: false
gem 'license_finder', '~> 5.4', require: false
gem 'knapsack', '~> 1.17'
gem 'stackprof', '~> 0.2.10', 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.8.0'
end
group :test do
- 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 'shoulda-matchers', '~> 4.0', '>= 4.0.1', require: false
+ gem 'email_spec', '~> 2.2'
+ gem 'json-schema', '~> 2.8'
+ gem 'webmock', '~> 3.5', '>= 3.5.1'
gem 'rails-controller-testing'
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.2.5'
# https://gitlab.com/gitlab-org/gitlab/issues/13996
@@ -426,11 +426,11 @@
gem 'oauth2', '~> 1.4'
@ -408,8 +326,8 @@ gitlab Gemfile
end
# Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 1.58.0'
+gem 'gitaly', '~> 1.58'
-gem 'gitaly', '~> 1.65.0'
+gem 'gitaly', '~> 1.65'
-gem 'grpc', '~> 1.19.0'
+gem 'grpc', '~> 1.19'

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

@ -3,7 +3,7 @@ Bundler will fail when it can't find these locally
--- a/Gemfile
+++ b/Gemfile
@@ -92,7 +92,6 @@
# https://gitlab.com/gitlab-org/gitlab-ce/issues/67263
# https://gitlab.com/gitlab-org/gitlab/issues/31747
gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
gem 'apollo_upload_server', '>= 2.0.0.beta3'
-gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
@ -39,5 +39,5 @@ Bundler will fail when it can't find these locally
-end
-
group :development, :test do
gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5.1', platform: :mri

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

@ -6,16 +6,16 @@
-group :development, :test do
+if ENV["INCLUDE_TEST_DEPENDS"] == "true"
gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'
@@ -378,9 +378,7 @@
gem 'simple_po_parser', '~> 1.1', '>= 1.1.2', require: false
gem 'simple_po_parser', '~> 1.1.2', require: false
gem 'timecop', '~> 0.8.0'
-end
-group :test do
gem 'shoulda-matchers', '~> 4.0', '>= 4.0.1', require: false
gem 'email_spec', '~> 2.2'
gem 'json-schema', '~> 2.8'
gem 'shoulda-matchers', '~> 4.0.1', require: false
gem 'email_spec', '~> 2.2.0'
gem 'json-schema', '~> 2.8.0'

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

@ -4,7 +4,7 @@
end
if ENV["INCLUDE_TEST_DEPENDS"] == "true"
- gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri
- gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'

2
debian/patches/0480-embed-gitlab-peek.patch vendored
View file

@ -3,7 +3,7 @@
@@ -303,7 +303,7 @@
# Perf bar
# https://gitlab.com/gitlab-org/gitlab-ee/issues/13996
# https://gitlab.com/gitlab-org/gitlab/issues/13996
-gem 'gitlab-peek', '~> 0.0.1', require: 'peek'
+gem 'gitlab-peek', '~> 0.0.1', require: 'peek', path: 'vendor/gems/gitlab-peek'

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

@ -8,4 +8,4 @@
+const ROOT_PATH = '/usr/share/gitlab';
const CACHE_PATH = process.env.WEBPACK_CACHE_PATH || path.join(ROOT_PATH, 'tmp/cache');
const IS_PRODUCTION = process.env.NODE_ENV === 'production';
const IS_DEV_SERVER = process.argv.join(' ').indexOf('webpack-dev-server') !== -1;
const IS_DEV_SERVER = process.env.WEBPACK_DEV_SERVER === 'true';

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

@ -1,6 +1,6 @@
--- a/package.json
+++ b/package.json
@@ -147,62 +147,7 @@
@@ -146,63 +146,7 @@
"xterm": "^3.5.0"
},
"devDependencies": {
@ -24,6 +24,7 @@
- "eslint-plugin-import": "^2.14.0",
- "eslint-plugin-jasmine": "^2.10.1",
- "eslint-plugin-jest": "^22.3.0",
- "eslint-plugin-no-jquery": "^2.1.0",
- "gettext-extractor": "^3.4.3",
- "gettext-extractor-vue": "^4.0.2",
- "graphql-tag": "^2.10.0",
@ -57,7 +58,7 @@
- "stylelint-scss": "^3.9.2",
- "timezone-mock": "^1.0.8",
- "vue-jest": "^4.0.0-beta.2",
- "webpack-dev-server": "^3.1.14",
- "webpack-dev-server": "^3.8.1",
- "yarn-deduplicate": "^1.1.1"
- },
+ },

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

@ -1,35 +1,3 @@
--- a/package.json
+++ b/package.json
@@ -122,29 +122,19 @@
"style-loader": "^0.23.1",
"svg4everybody": "2.1.9",
"three": "^0.84.0",
- "three-orbit-controls": "^82.1.0",
- "three-stl-loader": "^1.0.4",
"timeago.js": "^3.0.2",
"tiptap": "^1.8.0",
"tiptap-commands": "^1.4.0",
"tiptap-extensions": "^1.8.0",
- "underscore": "^1.9.0",
- "url-loader": "^1.1.2",
"visibilityjs": "^1.2.4",
"vue": "^2.6.10",
"vue-apollo": "^3.0.0-beta.28",
"vue-loader": "^15.7.0",
- "vue-resource": "^1.5.1",
"vue-router": "^3.0.2",
"vue-template-compiler": "^2.6.10",
"vue-virtual-scroll-list": "^1.3.1",
"vuedraggable": "^2.23.0",
"vuex": "^3.1.0",
- "webpack": "^4.29.0",
- "webpack-bundle-analyzer": "^3.3.2",
- "webpack-cli": "^3.2.1",
- "webpack-stats-plugin": "^0.2.1",
- "worker-loader": "^2.0.0",
"xterm": "^3.5.0"
},
"devDependencies": {
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -5,7 +5,6 @@
@ -55,7 +23,7 @@
},
module: {
@@ -370,16 +369,6 @@
@@ -370,19 +369,6 @@
// enable HMR only in webpack-dev-server
DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
@ -67,12 +35,15 @@
- openAnalyzer: false,
- reportFilename: path.join(ROOT_PATH, 'webpack-report/index.html'),
- statsFilename: path.join(ROOT_PATH, 'webpack-report/stats.json'),
- statsOptions: {
- source: false,
- },
- }),
-
new webpack.DefinePlugin({
// This one is used to define window.gon.ee and other things properly in tests:
'process.env.IS_GITLAB_EE': JSON.stringify(IS_EE),
@@ -405,6 +394,7 @@
'process.env.IS_EE': JSON.stringify(IS_EE),
@@ -408,6 +394,7 @@
node: {
fs: 'empty', // sqljs requires fs

2
debian/patches/0770-bump-node-d3.patch vendored
View file

@ -11,7 +11,7 @@ Subject: [PATCH 1/2] Update d3 node module 4.13 -> 5.12
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
"core-js": "^3.1.3",
"core-js": "^3.2.1",
"cropper": "^2.3.0",
"css-loader": "^1.0.0",
- "d3": "^4.13.0",