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:
Abhijith PA 2020-02-09 19:10:35 +05:30
parent 45d72b0e4e
commit 8fad47fa89
10 changed files with 59 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@ gitlab Gemfile
--- a/Gemfile
+++ b/Gemfile
@@ -10,10 +10,10 @@
@@ -10,10 +10,10 @@ gem 'nakayoshi_fork', '~> 0.0.4'
# Responders respond_to and respond_with
gem 'responders', '~> 3.0'
@ -16,7 +16,7 @@ gitlab Gemfile
# Supported DBs
gem 'pg', '~> 1.1'
@@ -29,25 +29,25 @@
@@ -29,25 +29,25 @@ gem 'devise', '~> 4.6'
gem 'doorkeeper', '~> 4.3'
gem 'doorkeeper-openid_connect', '~> 1.5'
gem 'omniauth', '~> 1.8'
@ -50,61 +50,16 @@ gitlab Gemfile
# Kerberos authentication. EE-only
gem 'gssapi', group: :kerberos
@@ -58,41 +58,41 @@
gem 'invisible_captcha', '~> 0.12.1'
# Two-factor authentication
-gem 'devise-two-factor', '~> 3.0.0'
+gem 'devise-two-factor', '~> 3.0'
gem 'rqrcode-rails3', '~> 0.1.7'
-gem 'attr_encrypted', '~> 3.1.0'
+gem 'attr_encrypted', '~> 3.1'
gem 'u2f', '~> 0.2.1'
@@ -65,7 +65,7 @@ gem 'u2f', '~> 0.2.1'
# GitLab Pages
-gem 'validates_hostname', '~> 1.0.6'
-gem 'rubyzip', '~> 1.3.0', require: 'zip'
+gem 'validates_hostname', '~> 1.0', '>= 1.0.6'
+gem 'rubyzip', '~> 1.3', require: 'zip'
gem 'validates_hostname', '~> 1.0.6'
-gem 'rubyzip', '~> 2.0.0', require: 'zip'
+gem 'rubyzip', '~> 2.0', require: 'zip'
# GitLab Pages letsencrypt support
-gem 'acme-client', '~> 2.0.2'
+gem 'acme-client', '~> 2.0', '>= 2.0.2'
gem 'acme-client', '~> 2.0.2'
# Browser detection
gem 'browser', '~> 2.5'
# GPG
-gem 'gpgme', '~> 2.0.19'
+gem 'gpgme', '~> 2.0', '>= 2.0.19'
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
-gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
+gem 'gitlab_omniauth-ldap', '~> 2.1', '>= 2.1.1', require: 'omniauth-ldap'
gem 'net-ldap'
# API
-gem 'grape', '~> 1.1.0'
+gem 'grape', '~> 1.1'
gem 'grape-entity', '~> 0.7.1'
-gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
+gem 'rack-cors', '~> 1.0', require: 'rack/cors'
# 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/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/issues/31747
-gem 'graphiql-rails', '~> 1.4.10'
-gem 'apollo_upload_server', '~> 2.0.0.beta3'
+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]
# Disable strong_params so that Mash does not respond to :permitted?
@@ -102,7 +102,7 @@
@@ -102,7 +102,7 @@ gem 'hashie-forbidden_attributes'
gem 'kaminari', '~> 1.0'
# HAML
@ -113,7 +68,7 @@ gitlab Gemfile
# Files attachments
gem 'carrierwave', '~> 1.3'
@@ -112,7 +112,7 @@
@@ -112,7 +112,7 @@ gem 'mini_magick'
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.
@ -122,68 +77,16 @@ gitlab Gemfile
gem 'fog-google', '~> 1.9'
gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0'
@@ -126,47 +126,47 @@
gem 'unf', '~> 0.1.4'
# Seed data
-gem 'seed-fu', '~> 2.3.7'
+gem 'seed-fu', '~> 2.3', '>= 2.3.7'
# Search
gem 'elasticsearch-model', '~> 0.1.9'
gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation'
-gem 'elasticsearch-api', '5.0.3'
+gem 'elasticsearch-api', '~> 5.0', '>= 5.0.3'
gem 'aws-sdk'
gem 'faraday_middleware-aws-signers-v4'
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.12'
-gem 'deckar01-task_list', '2.2.1'
-gem 'gitlab-markup', '~> 1.7.0'
-gem 'github-markup', '~> 1.7.0', require: 'github/markup'
+gem 'deckar01-task_list', '~> 2.2', '>= 2.2.1'
+gem 'gitlab-markup', '~> 1.7'
+gem 'github-markup', '~> 1.7', require: 'github/markup'
@@ -142,7 +142,7 @@ gem 'gitlab-markup', '~> 1.7.0'
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'commonmarker', '~> 0.20'
-gem 'RedCloth', '~> 4.3.2'
+gem 'RedCloth', '~> 4.3', '>= 4.3.2'
gem 'rdoc', '~> 6.0'
gem 'RedCloth', '~> 4.3.2'
-gem 'rdoc', '~> 6.1.2'
+gem 'rdoc', '~> 6.1'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
-gem 'asciidoctor', '~> 2.0.10'
+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.11.0'
+gem 'rouge', '~> 3.11'
gem 'truncato', '~> 0.7.11'
-gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.10.5'
+gem 'bootstrap_form', '~> 4.2', '>= 4.2.0'
+gem 'nokogiri', '~> 1.10', '>= 1.10.5'
gem 'escape_utils', '~> 1.1'
# Calendar rendering
gem 'icalendar'
# Diffs
-gem 'diffy', '~> 3.1.0'
+gem 'diffy', '~> 3.1'
gem 'diff_match_patch', '~> 0.1.0'
# Application server
-gem 'rack', '~> 2.0.7'
+gem 'rack', '~> 2.0', '>= 2.0.7'
group :unicorn do
- gem 'unicorn', '~> 5.4.1'
+ gem 'unicorn', '~> 5.4', '>= 5.4.1'
gem 'unicorn-worker-killer', '~> 0.4.4'
end
@@ -183,13 +183,13 @@
@@ -183,13 +183,13 @@ gem 'state_machines-activerecord', '~> 0
gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs
@ -200,7 +103,7 @@ gitlab Gemfile
# HTTP requests
gem 'httparty', '~> 0.16.4'
@@ -201,14 +201,14 @@
@@ -201,14 +201,14 @@ gem 'rainbow', '~> 3.0'
gem 'ruby-progressbar'
# GitLab settings
@ -218,7 +121,7 @@ gitlab Gemfile
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.1'
@@ -221,13 +221,13 @@
@@ -221,13 +221,13 @@ gem 'redis', '~> 4.0'
gem 'connection_pool', '~> 2.0'
# Redis session store
@ -234,7 +137,7 @@ gitlab Gemfile
# Jira integration
gem 'jira-ruby', '~> 1.7'
@@ -237,7 +237,7 @@
@@ -237,7 +237,7 @@ gem 'atlassian-jwt', '~> 0.2.0'
gem 'flowdock', '~> 0.7'
# Slack integration
@ -243,7 +146,7 @@ gitlab Gemfile
# Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5'
@@ -249,11 +249,11 @@
@@ -249,11 +249,11 @@ gem 'asana', '~> 0.9'
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
@ -257,7 +160,7 @@ gitlab Gemfile
# Sanitizes SVG input
gem 'loofah', '~> 2.2'
@@ -262,7 +262,7 @@
@@ -262,7 +262,7 @@ gem 'loofah', '~> 2.2'
gem 'licensee', '~> 8.9'
# Ace editor
@ -266,7 +169,7 @@ gitlab Gemfile
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.5'
@@ -280,10 +280,10 @@
@@ -280,10 +280,10 @@ gem 'gitlab_chronic_duration', '~> 0.10.
gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0'
@ -280,7 +183,7 @@ gitlab Gemfile
gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.2'
@@ -293,12 +293,12 @@
@@ -293,12 +293,12 @@ gem 'base32', '~> 0.3.0'
gem "gitlab-license", "~> 1.0"
# Protect against bruteforcing
@ -295,7 +198,7 @@ gitlab Gemfile
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.5'
@@ -306,11 +306,11 @@
@@ -306,11 +306,11 @@ gem 'gitlab-labkit', '~> 0.5'
# I18n
gem 'ruby_parser', '~> 3.8', require: false
gem 'rails-i18n', '~> 5.1'
@ -310,7 +213,7 @@ gitlab Gemfile
# Perf bar
gem 'peek', '~> 1.1'
@@ -422,7 +422,7 @@
@@ -422,7 +422,7 @@ gem 'mail_room', '~> 0.10.0'
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
@ -319,7 +222,7 @@ gitlab Gemfile
gem 'rbtrace', '~> 0.4', require: false
gem 'memory_profiler', '~> 0.9', require: false
gem 'benchmark-memory', '~> 0.1', require: false
@@ -432,11 +432,11 @@
@@ -432,11 +432,11 @@ gem 'activerecord-explain-analyze', '~>
gem 'oauth2', '~> 1.4'
# Health check
@ -334,7 +237,7 @@ gitlab Gemfile
# NTP client
gem 'net-ntp'
@@ -452,13 +452,13 @@
@@ -452,13 +452,13 @@ group :ed25519 do
end
# Gitaly GRPC protocol definitions
@ -352,7 +255,7 @@ gitlab Gemfile
# Feature toggles
gem 'flipper', '~> 0.17.1'
@@ -476,4 +476,4 @@
@@ -476,4 +476,4 @@ gem 'gitlab-net-dns', '~> 0.9.1'
# Countries list
gem 'countries', '~> 3.0'

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

@ -2,15 +2,15 @@ Bundler will fail when it can't find these locally
--- a/Gemfile
+++ b/Gemfile
@@ -93,7 +93,6 @@
@@ -93,7 +93,6 @@ gem 'graphql', '~> 1.9.11'
# 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 'graphiql-rails', '~> 1.4.10'
gem 'apollo_upload_server', '~> 2.0.0.beta3'
-gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
# Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes'
@@ -308,7 +307,6 @@
@@ -308,7 +307,6 @@ gem 'ruby_parser', '~> 3.8', require: fa
gem 'rails-i18n', '~> 5.1'
gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.3'
@ -18,7 +18,7 @@ Bundler will fail when it can't find these locally
gem 'batch-loader', '~> 1.4'
@@ -331,21 +329,6 @@
@@ -331,21 +329,6 @@ group :metrics do
gem 'raindrops', '~> 0.18'
end

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

@ -1,10 +1,10 @@
--- a/Gemfile
+++ b/Gemfile
@@ -137,7 +137,6 @@
@@ -137,7 +137,6 @@ gem 'faraday_middleware-aws-signers-v4'
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.12'
gem 'deckar01-task_list', '~> 2.2', '>= 2.2.1'
-gem 'gitlab-markup', '~> 1.7'
gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'deckar01-task_list', '2.2.1'
-gem 'gitlab-markup', '~> 1.7.0'
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'commonmarker', '~> 0.20'
gem 'RedCloth', '~> 4.3', '>= 4.3.2'
gem 'RedCloth', '~> 4.3.2'

6
debian/patches/0480-embed-elasticsearch-model.patch vendored
View file

@ -1,11 +1,11 @@
--- a/Gemfile
+++ b/Gemfile
@@ -128,7 +128,7 @@
gem 'seed-fu', '~> 2.3', '>= 2.3.7'
@@ -128,7 +128,7 @@ gem 'unf', '~> 0.1.4'
gem 'seed-fu', '~> 2.3.7'
# Search
-gem 'elasticsearch-model', '~> 0.1.9'
+gem 'elasticsearch-model', '~> 0.1.9', path: 'vendor/gems/elasticsearch-model'
gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation'
gem 'elasticsearch-api', '~> 5.0', '>= 5.0.3'
gem 'elasticsearch-api', '5.0.3'
gem 'aws-sdk'

11
debian/patches/0480-embed-elasticsearch-rails.patch vendored
View file

@ -1,11 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -129,7 +129,7 @@
# Search
gem 'elasticsearch-model', '~> 0.1.9', path: 'vendor/gems/elasticsearch-model'
-gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation'
+gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails'
gem 'elasticsearch-api', '~> 5.0', '>= 5.0.3'
gem 'aws-sdk'
gem 'faraday_middleware-aws-signers-v4'

6
debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch vendored
View file

@ -1,8 +1,8 @@
--- a/Gemfile
+++ b/Gemfile
@@ -132,7 +132,7 @@
gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails'
gem 'elasticsearch-api', '~> 5.0', '>= 5.0.3'
@@ -132,7 +132,7 @@ gem 'elasticsearch-model', '~> 0.1.9', p
gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation'
gem 'elasticsearch-api', '5.0.3'
gem 'aws-sdk'
-gem 'faraday_middleware-aws-signers-v4'
+gem 'faraday_middleware-aws-signers-v4', path: 'vendor/gems/faraday-middleware-aws-signers-v4'

12
debian/patches/0484-relax-asciidoctor-plantuml.patch vendored
View file

@ -10,18 +10,18 @@ Subject: [PATCH 1/2] Update asciidoctor-plantuml 0.0.9 -> 0.0.10
--- a/Gemfile
+++ b/Gemfile
@@ -143,7 +143,7 @@
@@ -143,7 +143,7 @@ gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 2.0', '>= 2.0.10'
gem 'asciidoctor', '~> 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
-gem 'asciidoctor-plantuml', '0.0.9'
+gem 'asciidoctor-plantuml', '~> 0.0.10'
gem 'rouge', '~> 3.11'
gem 'rouge', '~> 3.11.0'
gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2', '>= 4.2.0'
gem 'bootstrap_form', '~> 4.2.0'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -71,7 +71,7 @@
@@ -71,7 +71,7 @@ GEM
asciidoctor (2.0.10)
asciidoctor-include-ext (0.3.1)
asciidoctor (>= 1.5.6, < 3.0.0)
@ -30,7 +30,7 @@ Subject: [PATCH 1/2] Update asciidoctor-plantuml 0.0.9 -> 0.0.10
asciidoctor (>= 1.5.6, < 3.0.0)
ast (2.4.0)
atlassian-jwt (0.2.0)
@@ -1125,7 +1125,7 @@
@@ -1126,7 +1126,7 @@ DEPENDENCIES
asana (~> 0.9)
asciidoctor (~> 2.0.10)
asciidoctor-include-ext (~> 0.3.1)

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

@ -1,6 +1,6 @@
--- a/package.json
+++ b/package.json
@@ -142,62 +142,6 @@
@@ -143,62 +143,6 @@
"xterm": "^3.5.0"
},
"devDependencies": {

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
@@ -88,6 +88,7 @@
@@ -82,6 +82,7 @@
"fuzzaldrin-plus": "^0.5.0",
"glob": "^7.1.2",
"graphql": "^14.0.2",

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

@ -1,6 +1,6 @@
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -6,7 +6,6 @@
@@ -6,7 +6,6 @@ const VueLoaderPlugin = require('vue-loa
const StatsWriterPlugin = require('webpack-stats-plugin').StatsWriterPlugin;
const CompressionPlugin = require('compression-webpack-plugin');
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
@ -8,7 +8,7 @@
const CopyWebpackPlugin = require('copy-webpack-plugin');
const vendorDllHash = require('./helpers/vendor_dll_hash');
@@ -151,12 +150,12 @@
@@ -151,12 +150,12 @@ module.exports = {
resolve: {
extensions: ['.js', '.gql', '.graphql'],
@ -23,7 +23,7 @@
},
module: {
@@ -431,19 +430,6 @@
@@ -431,19 +430,6 @@ module.exports = {
// enable HMR only in webpack-dev-server
DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
@ -43,7 +43,7 @@
new webpack.DefinePlugin({
// This one is used to define window.gon.ee and other things properly in tests:
'process.env.IS_EE': JSON.stringify(IS_EE),
@@ -469,6 +455,7 @@
@@ -469,6 +455,7 @@ module.exports = {
node: {
fs: 'empty', // sqljs requires fs
@ -53,7 +53,7 @@
};
--- a/package.json
+++ b/package.json
@@ -50,58 +50,33 @@
@@ -50,59 +50,34 @@
"apollo-link-batch-http": "^1.2.11",
"apollo-upload-client": "^10.0.0",
"at.js": "^1.5.4",
@ -101,6 +101,7 @@
- "jszip": "^3.1.3",
- "jszip-utils": "^0.0.2",
"katex": "^0.10.0",
"lodash": "^4.17.15",
- "marked": "^0.3.12",
"mermaid": "^8.4.2",
"monaco-editor": "^0.15.6",
@ -112,7 +113,7 @@
"prismjs": "^1.6.0",
"prosemirror-markdown": "^1.3.0",
"prosemirror-model": "^1.6.4",
@@ -118,13 +93,9 @@
@@ -119,13 +94,9 @@
"svg4everybody": "2.1.9",
"swagger-ui-dist": "^3.24.3",
"three": "^0.84.0",
@ -126,7 +127,7 @@
"url-loader": "^2.1.0",
"visibilityjs": "^1.2.4",
"vue": "^2.6.10",
@@ -135,10 +106,6 @@
@@ -136,10 +107,6 @@
"vue-virtual-scroll-list": "^1.3.1",
"vuedraggable": "^2.23.0",
"vuex": "^3.1.0",