Deleted patches already applied upstream
This commit is contained in:
parent
9c9c70aabc
commit
9d45611290
4 changed files with 0 additions and 82 deletions
11
debian/patches/0488-relax-rdoc.patch
vendored
11
debian/patches/0488-relax-rdoc.patch
vendored
|
@ -1,11 +0,0 @@
|
||||||
--- a/Gemfile
|
|
||||||
+++ b/Gemfile
|
|
||||||
@@ -137,7 +137,7 @@
|
|
||||||
gem 'github-markup', '~> 1.7', require: 'github/markup'
|
|
||||||
gem 'commonmarker', '~> 0.20'
|
|
||||||
gem 'RedCloth', '~> 4.3', '>= 4.3.2'
|
|
||||||
-gem 'rdoc', '~> 6.1'
|
|
||||||
+gem 'rdoc', '~> 6.0'
|
|
||||||
gem 'org-ruby', '~> 0.9.12'
|
|
||||||
gem 'creole', '~> 0.5.0'
|
|
||||||
gem 'wikicloth', '0.8.1'
|
|
20
debian/patches/0670-allow-doorkeepr-4_3.patch
vendored
20
debian/patches/0670-allow-doorkeepr-4_3.patch
vendored
|
@ -1,20 +0,0 @@
|
||||||
Bug, https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22966
|
|
||||||
|
|
||||||
--- a/config/initializers/doorkeeper.rb
|
|
||||||
+++ b/config/initializers/doorkeeper.rb
|
|
||||||
@@ -114,15 +114,6 @@
|
|
||||||
base_controller '::Gitlab::BaseDoorkeeperController'
|
|
||||||
end
|
|
||||||
|
|
||||||
-# Monkey patch to avoid creating new applications if the scope of the
|
|
||||||
-# app created does not match the complete list of scopes of the configured app.
|
|
||||||
-# It also prevents the OAuth authorize application window to appear every time.
|
|
||||||
-
|
|
||||||
-# Remove after we upgrade the doorkeeper gem from version 4.3.2
|
|
||||||
-if Doorkeeper.gem_version > Gem::Version.new('4.3.2')
|
|
||||||
- raise "Doorkeeper was upgraded, please remove the monkey patch in #{__FILE__}"
|
|
||||||
-end
|
|
||||||
-
|
|
||||||
module Doorkeeper
|
|
||||||
module AccessTokenMixin
|
|
||||||
module ClassMethods
|
|
47
debian/patches/0770-bump-node-d3.patch
vendored
47
debian/patches/0770-bump-node-d3.patch
vendored
|
@ -1,47 +0,0 @@
|
||||||
From fd28d39ac35ec6123272d20ade21025403b38b78 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Pirate Praveen <praveen@debian.org>
|
|
||||||
Date: Fri, 18 Oct 2019 11:20:19 +0000
|
|
||||||
Subject: [PATCH 1/2] Update d3 node module 4.13 -> 5.12
|
|
||||||
|
|
||||||
---
|
|
||||||
package.json | 2 +-
|
|
||||||
yarn.lock | 130 +++++++++++++++------------------------------------
|
|
||||||
2 files changed, 38 insertions(+), 94 deletions(-)
|
|
||||||
|
|
||||||
Index: gitlab/app/assets/javascripts/vue_shared/components/bar_chart.vue
|
|
||||||
===================================================================
|
|
||||||
--- gitlab.orig/app/assets/javascripts/vue_shared/components/bar_chart.vue
|
|
||||||
+++ gitlab/app/assets/javascripts/vue_shared/components/bar_chart.vue
|
|
||||||
@@ -124,9 +124,7 @@ export default {
|
|
||||||
},
|
|
||||||
},
|
|
||||||
mounted() {
|
|
||||||
- if (!this.allValuesEmpty) {
|
|
||||||
- this.draw();
|
|
||||||
- }
|
|
||||||
+ this.draw();
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
draw() {
|
|
||||||
@@ -153,7 +151,7 @@ export default {
|
|
||||||
this.yScale = d3.scaleLinear().rangeRound([this.vbHeight, 0]);
|
|
||||||
|
|
||||||
this.xScale.domain(this.graphData.map(d => d.name));
|
|
||||||
- this.yScale.domain([0, d3.max(this.graphData.map(d => d.value))]);
|
|
||||||
+ this.yScale.domain([0, d3.max(this.graphData.map(d => d.value)) || Infinity]);
|
|
||||||
|
|
||||||
// Zoom/Panning Function
|
|
||||||
this.zoom = d3
|
|
||||||
Index: gitlab/package.json
|
|
||||||
===================================================================
|
|
||||||
--- gitlab.orig/package.json
|
|
||||||
+++ gitlab/package.json
|
|
||||||
@@ -58,7 +58,7 @@
|
|
||||||
"compression-webpack-plugin": "^3.0.0",
|
|
||||||
"copy-webpack-plugin": "^5.0.4",
|
|
||||||
"cropper": "^2.3.0",
|
|
||||||
- "d3": "^4.13.0",
|
|
||||||
+ "d3": "^5.12.0",
|
|
||||||
"diff": "^3.4.0",
|
|
||||||
"document-register-element": "1.13.1",
|
|
||||||
"dropzone": "^4.2.0",
|
|
4
debian/patches/series
vendored
4
debian/patches/series
vendored
|
@ -14,7 +14,6 @@
|
||||||
0484-relax-asciidoctor-plantuml.patch
|
0484-relax-asciidoctor-plantuml.patch
|
||||||
0485-relax-responders.patch
|
0485-relax-responders.patch
|
||||||
0486-relax-grpc-protobuf.patch
|
0486-relax-grpc-protobuf.patch
|
||||||
0488-relax-rdoc.patch
|
|
||||||
0500-set-webpack-root.patch
|
0500-set-webpack-root.patch
|
||||||
0510-remove-dev-dependencies.patch
|
0510-remove-dev-dependencies.patch
|
||||||
0520-add-system-lib-path-for-webpack.patch
|
0520-add-system-lib-path-for-webpack.patch
|
||||||
|
@ -23,12 +22,9 @@
|
||||||
0630-fix-mail-room-path.patch
|
0630-fix-mail-room-path.patch
|
||||||
0640-relax-ruby-version.patch
|
0640-relax-ruby-version.patch
|
||||||
0660-fix-gitlab-yml-path.patch
|
0660-fix-gitlab-yml-path.patch
|
||||||
0670-allow-doorkeepr-4_3.patch
|
|
||||||
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
|
0730-install-graphql-tag.patch
|
||||||
0740-use-packaged-modules.patch
|
0740-use-packaged-modules.patch
|
||||||
0750-fix-relative-paths.patch
|
0750-fix-relative-paths.patch
|
||||||
0770-bump-node-d3.patch
|
|
||||||
0780-embed-doorkeeper.patch
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue