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 2018-03-27 20:24:05 +05:30
parent 448628f984
commit 78b925fd30
24 changed files with 82 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -88,8 +88,8 @@ gitlab Gemfile
gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
# Language detection
-gem 'github-linguist', '~> 4.7.0', require: 'linguist'
+gem 'github-linguist', '~> 4.7', require: 'linguist'
-gem 'github-linguist', '~> 5.3.3', require: 'linguist'
+gem 'github-linguist', '~> 5.3', '>= 5.3.3', require: 'linguist'
# API
gem 'grape', '~> 1.0'
@ -108,7 +108,7 @@ gitlab Gemfile
# Files attachments
gem 'carrierwave', '~> 1.2'
@@ -119,31 +119,31 @@
@@ -119,32 +119,33 @@
gem 'unf', '~> 0.1.4'
# Seed data
@ -123,6 +123,7 @@ gitlab Gemfile
+gem 'deckar01-task_list', '2.0'
+gem 'gitlab-markup', '~> 1.6', '>= 1.6.2'
gem 'redcarpet', '~> 3.4'
gem 'commonmarker', '~> 0.17'
-gem 'RedCloth', '~> 4.3.2'
+gem 'RedCloth', '~> 4.3', '>= 4.3.2'
gem 'rdoc', '~> 4.2'
@ -135,8 +136,8 @@ gitlab Gemfile
gem 'rouge', '~> 2.0'
gem 'truncato', '~> 0.7.9'
-gem 'bootstrap_form', '~> 2.7.0'
-gem 'nokogiri', '~> 1.8.2'
+gem 'bootstrap_form', '~> 2.7'
gem 'nokogiri', '~> 1.8.2'
+gem 'nokogiri', '~> 1.8', '>= 1.8.2'
# Diffs
@ -150,7 +151,7 @@ gitlab Gemfile
gem 'unicorn-worker-killer', '~> 0.4.4'
end
@@ -156,7 +156,7 @@
@@ -157,7 +158,7 @@
# Background jobs
gem 'sidekiq', '~> 5.0'
gem 'sidekiq-cron', '~> 0.6.0'
@ -159,7 +160,7 @@ gitlab Gemfile
gem 'sidekiq-limit_fetch', '~> 3.4', require: false
# Cron Parser
@@ -169,36 +169,36 @@
@@ -170,36 +171,36 @@
gem 'rainbow', '~> 2.2'
# GitLab settings
@ -203,7 +204,7 @@ gitlab Gemfile
# Asana integration
gem 'asana', '~> 0.6.0'
@@ -207,35 +207,35 @@
@@ -208,35 +209,35 @@
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
@ -248,7 +249,7 @@ gitlab Gemfile
# Faster blank
gem 'fast_blank'
@@ -247,45 +247,45 @@
@@ -248,45 +249,45 @@
gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0'
@ -317,7 +318,7 @@ gitlab Gemfile
# Metrics
group :metrics do
@@ -380,7 +380,7 @@
@@ -381,7 +382,7 @@
gem 'test-prof', '~> 0.2.5'
end
@ -326,12 +327,8 @@ gitlab Gemfile
gem 'mail_room', '~> 0.9.1'
@@ -393,14 +393,14 @@
gem 'oauth2', '~> 1.4'
# Health check
-gem 'health_check', '~> 2.6.0'
+gem 'health_check', '~> 2.6'
@@ -397,12 +398,12 @@
gem 'health_check', '~> 2.6.0'
# System information
-gem 'vmstat', '~> 2.3.0'
@ -341,11 +338,22 @@ gitlab Gemfile
# SSH host key support
-gem 'net-ssh', '~> 4.1.0'
-gem 'sshkey', '~> 1.9.0'
+gem 'net-ssh', '~> 4.1'
+gem 'sshkey', '~> 1.9'
# Required for ED25519 SSH host key support
group :ed25519 do
@@ -426,4 +426,4 @@
@@ -418,7 +419,7 @@
# Locked until https://github.com/google/protobuf/issues/4210 is closed
gem 'google-protobuf', '= 3.5.1'
-gem 'toml-rb', '~> 1.0.0', require: false
+gem 'toml-rb', '~> 1.0', require: false
# Feature toggles
gem 'flipper', '~> 0.11.0'
@@ -430,4 +431,4 @@
gem 'grape_logging', '~> 1.7'
# Asset synchronization

4
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
+++ b/Gemfile
@@ -272,7 +272,6 @@
@@ -274,7 +274,6 @@
gem 'rails-i18n', '~> 4.0', '>= 4.0.9'
gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.2'
@ -10,7 +10,7 @@ Bundler will fail when it can't find these locally
gem 'batch-loader', '~> 1.2', '>= 1.2.1'
@@ -298,21 +297,6 @@
@@ -300,21 +299,6 @@
gem 'raindrops', '~> 0.18'
end

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -298,7 +298,7 @@
@@ -300,7 +300,7 @@
gem 'raindrops', '~> 0.18'
end
@ -9,7 +9,7 @@
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.4.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'
@@ -351,9 +351,9 @@
@@ -353,9 +353,9 @@
gem 'stackprof', '~> 0.2.10', require: false
gem 'simple_po_parser', '~> 1.1.2', require: false

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -357,7 +357,7 @@
@@ -359,7 +359,7 @@
gem 'shoulda-matchers', '~> 3.1.2', require: false
gem 'email_spec', '~> 1.6.0'
gem 'json-schema', '~> 2.8.0'

2
debian/patches/0250-relax-licensee.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -221,7 +221,7 @@
@@ -223,7 +223,7 @@
gem 'loofah', '~> 2.0', '>= 2.0.3'
# Working with license

11
debian/patches/0270-relax-toml-rb.patch vendored
View file

@ -1,11 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -399,7 +399,7 @@
# Locked until https://github.com/google/protobuf/issues/4210 is closed
gem 'google-protobuf', '= 3.5.1'
-gem 'toml-rb', '~> 0.3.15', require: false
+gem 'toml-rb', '>= 0.3.15', require: false
# Feature toggles
gem 'flipper', '~> 0.11.0'

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -280,7 +280,7 @@
@@ -282,7 +282,7 @@
gem 'peek', '~> 1.0', '>= 1.0.1'
gem 'peek-gc', '~> 0.0.2'
gem 'peek-host', '~> 1.0'

2
debian/patches/0300-relax-rbnacl.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -390,7 +390,7 @@
@@ -393,7 +393,7 @@
# Required for ED25519 SSH host key support
group :ed25519 do
gem 'rbnacl-libsodium'

2
debian/patches/0330-relax-acts-as-taggable-on.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -152,7 +152,7 @@
@@ -154,7 +154,7 @@
gem 'state_machines-activerecord', '~> 0.4.0'
# Issue tags

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -164,7 +164,7 @@
@@ -166,7 +166,7 @@
gem 'rufus-scheduler', '~> 3.4'
# HTTP requests

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -236,7 +236,7 @@
@@ -238,7 +238,7 @@
gem 'charlock_holmes', '~> 0.7.5'
# Faster JSON

4
debian/patches/0360-relax-rdoc.patch vendored
View file

@ -1,8 +1,8 @@
--- a/Gemfile
+++ b/Gemfile
@@ -128,7 +128,7 @@
gem 'gitlab-markup', '~> 1.6', '>= 1.6.2'
@@ -129,7 +129,7 @@
gem 'redcarpet', '~> 3.4'
gem 'commonmarker', '~> 0.17'
gem 'RedCloth', '~> 4.3', '>= 4.3.2'
-gem 'rdoc', '~> 4.2'
+gem 'rdoc', '>= 4.2'

2
debian/patches/0370-relax-prof.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -372,7 +372,7 @@
@@ -374,7 +374,7 @@
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'

10
debian/patches/0390-relax-gitaly-proto.patch vendored
View file

@ -1,11 +1,11 @@
--- a/Gemfile
+++ b/Gemfile
@@ -395,7 +395,7 @@
@@ -398,7 +398,7 @@
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.84.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.84', require: 'gitaly'
# Locked until https://github.com/google/protobuf/issues/4210 is closed
gem 'google-protobuf', '= 3.5.1'
-gem 'gitaly-proto', '~> 0.88.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.88', require: 'gitaly'
gem 'grpc', '~> 1.10.0'
# Locked until https://github.com/google/protobuf/issues/4210 is closed

8
debian/patches/0391-relax-google-protobuf.patch vendored
View file

@ -1,11 +1,11 @@
--- a/Gemfile
+++ b/Gemfile
@@ -397,7 +397,7 @@
# Gitaly GRPC client
gem 'gitaly-proto', '~> 0.84', require: 'gitaly'
@@ -402,7 +402,7 @@
gem 'grpc', '~> 1.10.0'
# Locked until https://github.com/google/protobuf/issues/4210 is closed
-gem 'google-protobuf', '= 3.5.1'
+gem 'google-protobuf', '~> 3.2'
gem 'toml-rb', '>= 0.3.15', require: false
gem 'toml-rb', '~> 1.0', require: false

4
debian/patches/0392-relax-flipper.patch vendored
View file

@ -1,7 +1,7 @@
--- a/Gemfile
+++ b/Gemfile
@@ -402,9 +402,9 @@
gem 'toml-rb', '>= 0.3.15', require: false
@@ -407,9 +407,9 @@
gem 'toml-rb', '~> 1.0', require: false
# Feature toggles
-gem 'flipper', '~> 0.11.0'

2
debian/patches/0393-relax-kubeclient.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -208,7 +208,7 @@
@@ -210,7 +210,7 @@
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration

14
debian/patches/0410-set-webpack-root.patch vendored
View file

@ -1,11 +1,11 @@
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -12,7 +12,7 @@
var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
var WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
-var ROOT_PATH = path.resolve(__dirname, '..');
+var ROOT_PATH = '/usr/share/gitlab';
var IS_PRODUCTION = process.env.NODE_ENV === 'production';
var IS_DEV_SERVER = process.argv.join(' ').indexOf('webpack-dev-server') !== -1;
var DEV_SERVER_HOST = process.env.DEV_SERVER_HOST || 'localhost';
-const ROOT_PATH = path.resolve(__dirname, '..');
+const ROOT_PATH = '/usr/share/gitlab';
const IS_PRODUCTION = process.env.NODE_ENV === 'production';
const IS_DEV_SERVER = process.argv.join(' ').indexOf('webpack-dev-server') !== -1;
const DEV_SERVER_HOST = process.env.DEV_SERVER_HOST || 'localhost';

9
debian/patches/0415-remove-dev-dependencies.patch vendored
View file

@ -1,11 +1,12 @@
--- a/package.json
+++ b/package.json
@@ -90,30 +90,5 @@
@@ -91,31 +91,5 @@
"worker-loader": "^1.1.0"
},
"devDependencies": {
- "@gitlab-org/gitlab-svgs": "^1.8.0",
- "axios-mock-adapter": "^1.10.0",
- "babel-eslint": "^8.0.2",
- "babel-plugin-istanbul": "^4.1.5",
- "eslint": "^3.18.0",
- "eslint-config-airbnb-base": "^10.0.1",
@ -21,13 +22,13 @@
- "jasmine-jquery": "^2.1.1",
- "karma": "^2.0.0",
- "karma-chrome-launcher": "^2.2.0",
- "karma-coverage-istanbul-reporter": "^1.3.3",
- "karma-coverage-istanbul-reporter": "^1.4.1",
- "karma-jasmine": "^1.1.1",
- "karma-mocha-reporter": "^2.2.5",
- "karma-sourcemap-loader": "^0.3.7",
- "karma-webpack": "2.0.7",
- "nodemon": "^1.11.0",
- "nodemon": "^1.15.1",
- "prettier": "1.9.2",
- "webpack-dev-server": "^2.6.1"
- "webpack-dev-server": "^2.11.2"
}
}

10
debian/patches/0420-use-system-node-libs.patch vendored
View file

@ -1,11 +1,10 @@
--- a/package.json
+++ b/package.json
@@ -15,30 +15,14 @@
@@ -15,30 +15,15 @@
"dependencies": {
"autosize": "^4.0.0",
"axios": "^0.17.1",
- "babel-core": "^6.26.0",
- "babel-eslint": "^8.0.2",
- "babel-loader": "^7.1.2",
- "babel-plugin-transform-define": "^1.3.0",
- "babel-preset-latest": "^6.24.1",
@ -13,13 +12,14 @@
"blackst0ne-mermaid": "^7.1.0-fixed",
- "bootstrap-sass": "^3.3.6",
"brace-expansion": "^1.1.8",
"chart.js": "1.0.2",
"classlist-polyfill": "^1.2.0",
"clipboard": "^1.7.1",
"compression-webpack-plugin": "^1.0.0",
"copy-webpack-plugin": "^4.0.1",
"compression-webpack-plugin": "^1.1.7",
"copy-webpack-plugin": "^4.4.1",
- "core-js": "^2.4.1",
"cropper": "^2.3.0",
"css-loader": "^0.28.0",
"css-loader": "^0.28.9",
- "d3-array": "^1.2.1",
- "d3-axis": "^1.0.8",
- "d3-brush": "^1.0.4",

19
debian/patches/890757.patch vendored
View file

@ -1,19 +0,0 @@
Last-Update: 2018-03-14
Forwarded: not-needed
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=890757
Author: Dmitry Smirnov <onlyjob@debian.org>
Description: fix markdown rendering.
Thanks, Libor Klepáč.
--- a/lib/banzai/filter/markdown_filter.rb
+++ b/lib/banzai/filter/markdown_filter.rb
@@ -26,7 +26,7 @@
def self.renderer
Thread.current[:banzai_markdown_renderer] ||= begin
- renderer = Banzai::Renderer::HTML.new
+ renderer = Redcarpet::Renderer::HTML.new
Redcarpet::Markdown.new(renderer, REDCARPET_OPTIONS)
end
end

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

@ -1,6 +1,6 @@
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -331,6 +331,7 @@
@@ -234,6 +234,7 @@
resolve: {
extensions: ['.js'],
@ -8,16 +8,14 @@
alias: {
'~': path.join(ROOT_PATH, 'app/assets/javascripts'),
'emojis': path.join(ROOT_PATH, 'fixtures/emojis'),
@@ -340,7 +341,12 @@
'vendor': path.join(ROOT_PATH, 'vendor/assets/javascripts'),
'vue$': 'vue/dist/vue.esm.js',
@@ -246,6 +247,10 @@
}
+ },
+
},
+ resolveLoader: {
+ modules: ['/usr/share/gitlab/node_modules', '/usr/lib/nodejs'],
}
+ },
+
}
config.entry = Object.assign({}, autoEntries, config.entry);
// sqljs requires fs
node: {
fs: 'empty',

14
debian/patches/remove-bundle-analyzer.patch vendored
View file

@ -1,14 +1,14 @@
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -9,7 +9,6 @@
var CopyWebpackPlugin = require('copy-webpack-plugin');
var CompressionPlugin = require('compression-webpack-plugin');
var NameAllModulesPlugin = require('name-all-modules-plugin');
-var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
var WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const CompressionPlugin = require('compression-webpack-plugin');
const NameAllModulesPlugin = require('name-all-modules-plugin');
-const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
var ROOT_PATH = '/usr/share/gitlab';
@@ -393,16 +392,4 @@
const ROOT_PATH = '/usr/share/gitlab';
@@ -316,16 +315,4 @@
}
}

2
debian/patches/series vendored
View file

@ -6,7 +6,6 @@ source-init-functions.patch
pid-log-paths.patch
0220-relax-webmock.patch
0250-relax-licensee.patch
0270-relax-toml-rb.patch
0280-relax-pg.patch
0290-skip-peek-mysql2.patch
0300-relax-rbnacl.patch
@ -24,7 +23,6 @@ pid-log-paths.patch
0410-set-webpack-root.patch
0415-remove-dev-dependencies.patch
0420-use-system-node-libs.patch
890757.patch
add-system-lib-path-for-webpack.patch
remove-bundle-analyzer.patch
fix-mail-room-path.patch