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

Refresh patches and delete obselete patches

Browse source
This commit is contained in:
Sruthi Chandran 2019-10-12 22:33:52 +05:30
parent dffb5523fb
commit a140b234c7
18 changed files with 70 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@ gitlab Gemfile
--- a/Gemfile
+++ b/Gemfile
@@ -8,10 +8,10 @@
@@ -10,10 +10,10 @@
# Responders respond_to and respond_with
gem 'responders', '~> 2.0'
@ -15,8 +15,8 @@ gitlab Gemfile
+gem 'default_value_for', '~> 3.2'
# Supported DBs
gem 'mysql2', '~> 0.4.10', group: :mysql
@@ -27,63 +27,63 @@
gem 'pg', '~> 1.1'
@@ -28,25 +28,25 @@
gem 'doorkeeper', '~> 4.3'
gem 'doorkeeper-openid_connect', '~> 1.5'
gem 'omniauth', '~> 1.8'
@ -51,7 +51,8 @@ gitlab Gemfile
# Spam and anti-bot protection
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 2.0'
@@ -54,38 +54,38 @@
gem 'invisible_captcha', '~> 0.12.1'
# Two-factor authentication
-gem 'devise-two-factor', '~> 3.0.0'
@ -101,7 +102,7 @@ gitlab Gemfile
gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
# Disable strong_params so that Mash does not respond to :permitted?
@@ -93,7 +93,7 @@
@@ -95,7 +95,7 @@
gem 'kaminari', '~> 1.0'
# HAML
@ -110,7 +111,7 @@ gitlab Gemfile
# Files attachments
gem 'carrierwave', '~> 1.3'
@@ -103,7 +103,7 @@
@@ -105,7 +105,7 @@
gem 'fog-aws', '~> 3.5'
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
# Also see config/initializers/fog_core_patch.rb.
@ -119,7 +120,7 @@ gitlab Gemfile
gem 'fog-google', '~> 1.8'
gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0'
@@ -117,39 +117,39 @@
@@ -119,39 +119,39 @@
gem 'unf', '~> 0.1.4'
# Seed data
@ -145,12 +146,12 @@ 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.5'
gem 'rouge', '~> 3.7'
gem 'truncato', '~> 0.7.11'
-gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.10.3'
-gem 'nokogiri', '~> 1.10.4'
+gem 'bootstrap_form', '~> 4.2'
+gem 'nokogiri', '~> 1.10', '>= 1.10.3'
+gem 'nokogiri', '~> 1.10', '>= 1.10.4'
gem 'escape_utils', '~> 1.1'
# Calendar rendering
@ -170,7 +171,7 @@ gitlab Gemfile
gem 'unicorn-worker-killer', '~> 0.4.4'
end
@@ -166,13 +166,13 @@
@@ -168,13 +168,13 @@
gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs
@ -179,15 +180,15 @@ gitlab Gemfile
gem 'sidekiq-cron', '~> 1.0'
-gem 'redis-namespace', '~> 1.6.0'
+gem 'redis-namespace', '~> 1.6'
gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
gem 'gitlab-sidekiq-fetcher', '0.5.1', require: 'sidekiq-reliable-fetch'
# Cron Parser
-gem 'fugit', '~> 1.2.1'
+gem 'fugit', '~> 1.2', '>=1.2.1'
+gem 'fugit', '~> 1.2', '>= 1.2.1'
# HTTP requests
gem 'httparty', '~> 0.16.4'
@@ -184,14 +184,14 @@
@@ -186,14 +186,14 @@
gem 'ruby-progressbar'
# GitLab settings
@ -205,16 +206,14 @@ gitlab Gemfile
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.1'
@@ -200,7 +200,7 @@
gem 'device_detector'
@@ -206,13 +206,13 @@
gem 'connection_pool', '~> 2.0'
# Cache
# Redis session store
-gem 'redis-rails', '~> 5.0.2'
+gem 'redis-rails', '~> 5.0', '>= 5.0.2'
# Redis
gem 'redis', '~> 3.2'
@@ -210,7 +210,7 @@
# Discord integration
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
# HipChat integration
@ -223,7 +222,7 @@ gitlab Gemfile
# Jira integration
gem 'jira-ruby', '~> 1.4'
@@ -219,7 +219,7 @@
@@ -221,7 +221,7 @@
gem 'flowdock', '~> 0.7'
# Slack integration
@ -232,7 +231,7 @@ gitlab Gemfile
# Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5'
@@ -231,11 +231,11 @@
@@ -233,11 +233,11 @@
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
@ -246,7 +245,7 @@ gitlab Gemfile
# Sanitizes SVG input
gem 'loofah', '~> 2.2'
@@ -244,10 +244,10 @@
@@ -246,10 +246,10 @@
gem 'licensee', '~> 8.9'
# Protect against bruteforcing
@ -259,7 +258,7 @@ gitlab Gemfile
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.5'
@@ -265,21 +265,21 @@
@@ -267,21 +267,21 @@
gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0'
@ -285,8 +284,8 @@ gitlab Gemfile
+gem 'premailer-rails', '~> 1.9', '>=1.9.7'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.3.0'
@@ -287,19 +287,19 @@
gem 'gitlab-labkit', '~> 0.4.2'
@@ -289,14 +289,14 @@
# I18n
gem 'ruby_parser', '~> 3.8', require: false
gem 'rails-i18n', '~> 5.1'
@ -302,21 +301,13 @@ gitlab Gemfile
# Perf bar
-gem 'peek', '~> 1.0.1'
+gem 'peek', '~> 1.0', '>= 1.0.1'
gem 'peek-gc', '~> 0.0.2'
-gem 'peek-mysql2', '~> 1.2.0', group: :mysql
-gem 'peek-pg', '~> 1.3.0', group: :postgres
+gem 'peek-mysql2', '~> 1.2', group: :mysql
+gem 'peek-pg', '~> 1.3', group: :postgres
gem 'peek-rblineprof', '~> 0.2.0'
-gem 'peek-redis', '~> 1.2.0'
+gem 'peek-redis', '~> 1.2'
# Memory benchmarks
gem 'derailed_benchmarks', require: false
@@ -331,39 +331,39 @@
# Snowplow events tracking
gem 'snowplow-tracker', '~> 0.6.1'
@@ -330,39 +330,39 @@
end
group :development, :test do
gem 'bootsnap', '~> 1.4'
- 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']
@ -366,7 +357,7 @@ gitlab Gemfile
gem 'scss_lint', '~> 0.56.0', require: false
gem 'haml_lint', '~> 0.31.0', require: false
@@ -371,7 +371,7 @@
@@ -370,7 +370,7 @@
gem 'bundler-audit', '~> 0.5.0', require: false
gem 'mdl', '~> 0.5.0', require: false
@ -375,12 +366,12 @@ gitlab Gemfile
gem 'license_finder', '~> 5.4', require: false
gem 'knapsack', '~> 1.17'
@@ -380,18 +380,18 @@
@@ -379,16 +379,16 @@
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 'simple_po_parser', '~> 1.1', '>= 1.1.2', require: false
gem 'timecop', '~> 0.8.0'
end
@ -390,17 +381,14 @@ gitlab Gemfile
- 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 '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 'webmock', '~> 3.5', '>= 3.5.1'
gem 'rails-controller-testing'
- gem 'sham_rack', '~> 1.3.6'
+ gem 'sham_rack', '~> 1.3', '>=1.3.6'
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.2.5'
gem 'rspec_junit_formatter'
@@ -414,11 +414,11 @@
@@ -412,11 +412,11 @@
gem 'oauth2', '~> 1.4'
# Health check
@ -415,12 +403,12 @@ gitlab Gemfile
# SSH host key support
gem 'net-ssh', '~> 5.2'
@@ -431,13 +431,13 @@
@@ -429,13 +429,13 @@
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 1.37.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 1.37', require: 'gitaly'
# Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 1.58.0'
+gem 'gitaly', '~> 1.58'
-gem 'grpc', '~> 1.19.0'
+gem 'grpc', '~> 1.19'

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
+++ b/Gemfile
@@ -84,7 +84,6 @@
@@ -86,7 +86,6 @@
gem 'graphql', '~> 1.8'
gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
gem 'apollo_upload_server', '>= 2.0.0.beta3'
@ -10,7 +10,7 @@ Bundler will fail when it can't find these locally
# Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes'
@@ -289,7 +288,6 @@
@@ -291,7 +290,6 @@
gem 'rails-i18n', '~> 5.1'
gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.3'
@ -38,5 +38,5 @@ Bundler will fail when it can't find these locally
-end
-
group :development, :test do
gem 'bootsnap', '~> 1.4'
gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri

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

@ -1,23 +0,0 @@
From 85ec69dca3e07b27079efe1392574d7fb317186f Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Sat, 23 Jan 2016 10:14:15 -0500
Subject: [PATCH] allow specifying DB choice via ENV variable
---
Gemfile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/Gemfile
+++ b/Gemfile
@@ -14,8 +14,9 @@
gem 'default_value_for', '~> 3.2'
# Supported DBs
-gem 'mysql2', '~> 0.4.10', group: :mysql
-gem 'pg', '~> 1.1', group: :postgres
+ENV["DB"] ||= "postgresql"
+gem 'mysql2', '~> 0.4.10' if ENV["DB"] == "all" || ENV["DB"] == "mysql"
+gem 'pg', '~> 1.1' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
gem 'rugged', '~> 0.28'
gem 'grape-path-helpers', '~> 1.1'

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

@ -1,23 +1,11 @@
--- a/Gemfile
+++ b/Gemfile
@@ -313,7 +313,7 @@
@@ -312,7 +312,7 @@
gem 'raindrops', '~> 0.18'
end
-group :development, :test do
+if ENV["INCLUDE_TEST_DEPENDS"] == "true"
gem 'bootsnap', '~> 1.4'
gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri
@@ -367,9 +367,9 @@
gem 'simple_po_parser', '~> 1.1', '>=1.1.2', require: false
gem 'timecop', '~> 0.8.0'
-end
+#end
-group :test do
+#group :test do
gem 'shoulda-matchers', '~> 4.0', '>=4.0.1', require: false
gem 'email_spec', '~> 2.2'
gem 'json-schema', '~> 2.8'
gem 'pry-rails', '~> 0.3.4'

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

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

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

@ -1,7 +1,7 @@
--- a/Gemfile
+++ b/Gemfile
@@ -175,7 +175,7 @@
gem 'fugit', '~> 1.2', '>=1.2.1'
@@ -176,7 +176,7 @@
gem 'fugit', '~> 1.2', '>= 1.2.1'
# HTTP requests
-gem 'httparty', '~> 0.16.4'

11
debian/patches/0410-relax-gitlab-labkit.patch vendored
View file

@ -1,11 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -282,7 +282,7 @@
gem 'premailer-rails', '~> 1.9', '>=1.9.7'
# LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '~> 0.3.0'
+gem 'gitlab-labkit', '~> 0.3'
# I18n
gem 'ruby_parser', '~> 3.8', require: false

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -152,12 +152,6 @@
@@ -153,12 +153,6 @@
gem 'unicorn-worker-killer', '~> 0.4.4'
end

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

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

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

@ -1,7 +1,7 @@
--- a/Gemfile
+++ b/Gemfile
@@ -293,7 +293,9 @@
gem 'peek-redis', '~> 1.2'
gem 'snowplow-tracker', '~> 0.6.1'
# Memory benchmarks
-gem 'derailed_benchmarks', require: false

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

@ -1,8 +1,8 @@
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -7,7 +7,7 @@
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
@@ -8,7 +8,7 @@
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
const CopyWebpackPlugin = require('copy-webpack-plugin');
-const ROOT_PATH = path.resolve(__dirname, '..');
+const ROOT_PATH = '/usr/share/gitlab';

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

@ -1,12 +1,13 @@
--- a/package.json
+++ b/package.json
@@ -145,59 +145,6 @@
@@ -145,60 +145,6 @@
"xterm": "^3.5.0"
},
"devDependencies": {
- "@babel/plugin-transform-modules-commonjs": "^7.2.0",
- "@gitlab/eslint-config": "^1.6.0",
- "@gitlab/eslint-plugin-i18n": "^1.1.0",
- "@gitlab/eslint-plugin-vue-i18n": "^1.2.0",
- "@vue/test-utils": "^1.0.0-beta.25",
- "axios-mock-adapter": "^1.15.0",
- "babel-jest": "^24.1.0",
@ -36,14 +37,14 @@
- "jest-util": "^24.0.0",
- "jsdoc": "^3.5.5",
- "jsdoc-vue": "^1.0.0",
- "karma": "^3.0.0",
- "karma-chrome-launcher": "^2.2.0",
- "karma-coverage-istanbul-reporter": "^2.0.4",
- "karma": "^4.2.0",
- "karma-chrome-launcher": "^3.0.0",
- "karma-coverage-istanbul-reporter": "^2.1.0",
- "karma-jasmine": "^1.1.2",
- "karma-junit-reporter": "^1.2.0",
- "karma-mocha-reporter": "^2.2.5",
- "karma-sourcemap-loader": "^0.3.7",
- "karma-webpack": "^4.0.0-beta.0",
- "karma-webpack": "^4.0.2",
- "md5": "^2.2.1",
- "node-sass": "^4.12.0",
- "nodemon": "^1.18.9",
@ -51,9 +52,9 @@
- "postcss": "^7.0.14",
- "prettier": "1.18.2",
- "readdir-enhanced": "^2.2.4",
- "stylelint": "^9.10.1",
- "stylelint-config-recommended": "^2.1.0",
- "stylelint-scss": "^3.5.4",
- "stylelint": "^10.1.0",
- "stylelint-config-recommended": "^2.2.0",
- "stylelint-scss": "^3.9.2",
- "vue-jest": "^4.0.0-beta.2",
- "webpack-dev-server": "^3.1.14",
- "yarn-deduplicate": "^1.1.1"

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

@ -1,6 +1,6 @@
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -119,9 +119,14 @@ module.exports = {
@@ -126,9 +126,14 @@
resolve: {
extensions: ['.js', '.gql', '.graphql'],

2
debian/patches/0660-fix-gitlab-yml-path.patch vendored
View file

@ -1,6 +1,6 @@
--- a/config/settings.rb
+++ b/config/settings.rb
@@ -7,7 +7,7 @@
@@ -8,7 +8,7 @@
require_dependency File.expand_path('../lib/gitlab', __dir__)
class Settings < Settingslogic

2
debian/patches/0730-install-graphql-tag.patch vendored
View file

@ -3,7 +3,7 @@ Author: Utkarsh Gupta <guptautkarsh2102@gmail.com>
--- a/package.json
+++ b/package.json
@@ -84,6 +84,7 @@
@@ -85,6 +85,7 @@
"fuzzaldrin-plus": "^0.5.0",
"glob": "^7.1.2",
"graphql": "^14.0.2",

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

@ -1,7 +1,7 @@
--- a/package.json
+++ b/package.json
@@ -121,28 +121,17 @@
"stylelint-error-string-formatter": "1.0.2",
"style-loader": "^0.23.1",
"svg4everybody": "2.1.9",
"three": "^0.84.0",
- "three-orbit-controls": "^82.1.0",
@ -36,10 +36,10 @@
const CompressionPlugin = require('compression-webpack-plugin');
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
-const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
const CopyWebpackPlugin = require('copy-webpack-plugin');
const ROOT_PATH = '/usr/share/gitlab';
const CACHE_PATH = process.env.WEBPACK_CACHE_PATH || path.join(ROOT_PATH, 'tmp/cache');
@@ -119,12 +118,12 @@
@@ -126,12 +125,12 @@
resolve: {
extensions: ['.js', '.gql', '.graphql'],
@ -54,7 +54,7 @@
},
module: {
@@ -316,16 +315,6 @@
@@ -338,16 +337,6 @@
// enable HMR only in webpack-dev-server
DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
@ -71,7 +71,7 @@
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),
@@ -351,6 +340,7 @@
@@ -373,6 +362,7 @@
node: {
fs: 'empty', // sqljs requires fs

2
debian/patches/0750-fix-relative-paths.patch vendored
View file

@ -20,7 +20,7 @@
Rails.application.initialize!
--- a/config/settings.rb
+++ b/config/settings.rb
@@ -4,7 +4,7 @@
@@ -5,7 +5,7 @@
# full Rails environment being loaded. We can not use `require_relative` either,
# as Rails uses `load` for `require_dependency` (used when loading the Rails
# environment). This could then lead to this file being loaded twice.

3
debian/patches/series vendored
View file

@ -1,11 +1,8 @@
0050-relax-stable-libs.patch
0100-remove-development-test.patch
0108-make-mysql-optional.patch
0110-make-test-dependencies-conditional.patch
0290-skip-peek-mysql2.patch
0340-relax-httparty.patch
#0400-Relax-recaptcha-version.patch
0410-relax-gitlab-labkit.patch
0430-remove-gitlab-markup.patch
0440-remove-puma.patch
0450-remove-bullet.patch