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-26 22:33:15 +05:30
parent c537c1337d
commit 7c745a8784
18 changed files with 69 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,14 +5,14 @@ gitlab Gemfile
+++ b/Gemfile
@@ -10,10 +10,10 @@
# Responders respond_to and respond_with
gem 'responders', '~> 2.0'
gem 'responders', '~> 3.0'
-gem 'sprockets', '~> 3.7.0'
+gem 'sprockets', '~> 3.7'
# Default values for AR models
-gem 'default_value_for', '~> 3.2.0'
+gem 'default_value_for', '~> 3.2'
-gem 'default_value_for', '~> 3.3.0'
+gem 'default_value_for', '~> 3.3'
# Supported DBs
gem 'pg', '~> 1.1'
@ -23,9 +23,8 @@ gitlab Gemfile
-gem 'omniauth-auth0', '~> 2.0.0'
+gem 'omniauth-auth0', '~> 2.0'
gem 'omniauth-azure-oauth2', '~> 0.0.9'
-gem 'omniauth-cas3', '~> 1.1.4'
gem 'omniauth-cas3', '~> 1.1.4'
-gem 'omniauth-facebook', '~> 4.0.0'
+gem 'omniauth-cas3', '~> 1.1', '>= 1.1.4'
+gem 'omniauth-facebook', '~> 4.0'
gem 'omniauth-github', '~> 1.3'
-gem 'omniauth-gitlab', '~> 1.0.2'
@ -40,7 +39,7 @@ gitlab Gemfile
-gem 'omniauth_crowd', '~> 2.2.0'
+gem 'omniauth_crowd', '~> 2.2'
gem 'omniauth-authentiq', '~> 0.3.3'
gem 'omniauth_openid_connect', '~> 0.3.1'
gem 'omniauth_openid_connect', '~> 0.3.3'
gem "omniauth-ultraauth", '~> 0.0.2'
-gem 'omniauth-salesforce', '~> 1.0.5'
-gem 'rack-oauth2', '~> 1.9.3'
@ -64,9 +63,9 @@ gitlab Gemfile
# GitLab Pages
-gem 'validates_hostname', '~> 1.0.6'
-gem 'rubyzip', '~> 1.2.2', require: 'zip'
-gem 'rubyzip', '~> 1.3.0', require: 'zip'
+gem 'validates_hostname', '~> 1.0', '>= 1.0.6'
+gem 'rubyzip', '~> 1.2', '>= 1.2.2', require: 'zip'
+gem 'rubyzip', '~> 1.3', require: 'zip'
# GitLab Pages letsencrypt support
-gem 'acme-client', '~> 2.0.2'
+gem 'acme-client', '~> 2.0', '>= 2.0.2'
@ -75,8 +74,8 @@ gitlab Gemfile
gem 'browser', '~> 2.5'
# GPG
-gem 'gpgme', '~> 2.0.18'
+gem 'gpgme', '~> 2.0', '>= 2.0.18'
-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
@ -123,7 +122,7 @@ gitlab Gemfile
gem 'fog-google', '~> 1.9'
gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0'
@@ -125,46 +125,46 @@
@@ -125,47 +125,47 @@
gem 'unf', '~> 0.1.4'
# Seed data
@ -140,10 +139,10 @@ gitlab Gemfile
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
-gem 'deckar01-task_list', '2.2.0'
-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'
+gem 'deckar01-task_list', '~> 2.2', '>= 2.2.1'
+gem 'gitlab-markup', '~> 1.7'
+gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.17'
@ -161,9 +160,9 @@ gitlab Gemfile
+gem 'rouge', '~> 3.11'
gem 'truncato', '~> 0.7.11'
-gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.10.4'
-gem 'nokogiri', '~> 1.10.5'
+gem 'bootstrap_form', '~> 4.2'
+gem 'nokogiri', '~> 1.10', '>= 1.10.4'
+gem 'nokogiri', '~> 1.10', '>= 1.10.5'
gem 'escape_utils', '~> 1.1'
# Calendar rendering
@ -172,6 +171,7 @@ gitlab Gemfile
# Diffs
-gem 'diffy', '~> 3.1.0'
+gem 'diffy', '~> 3.1'
gem 'diff_match_patch', '~> 0.1.0'
# Application server
-gem 'rack', '~> 2.0.7'
@ -183,7 +183,7 @@ gitlab Gemfile
gem 'unicorn-worker-killer', '~> 0.4.4'
end
@@ -181,13 +181,13 @@
@@ -182,13 +182,13 @@
gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs
@ -200,7 +200,7 @@ gitlab Gemfile
# HTTP requests
gem 'httparty', '~> 0.16.4'
@@ -199,14 +199,14 @@
@@ -200,14 +200,14 @@
gem 'ruby-progressbar'
# GitLab settings
@ -218,7 +218,7 @@ gitlab Gemfile
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.1'
@@ -219,13 +219,13 @@
@@ -220,13 +220,13 @@
gem 'connection_pool', '~> 2.0'
# Redis session store
@ -234,7 +234,7 @@ gitlab Gemfile
# Jira integration
gem 'jira-ruby', '~> 1.7'
@@ -235,7 +235,7 @@
@@ -236,7 +236,7 @@
gem 'flowdock', '~> 0.7'
# Slack integration
@ -243,7 +243,7 @@ gitlab Gemfile
# Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5'
@@ -247,11 +247,11 @@
@@ -248,11 +248,11 @@
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
@ -257,20 +257,16 @@ gitlab Gemfile
# Sanitizes SVG input
gem 'loofah', '~> 2.2'
@@ -260,10 +260,10 @@
@@ -261,7 +261,7 @@
gem 'licensee', '~> 8.9'
# Protect against bruteforcing
-gem 'rack-attack', '~> 4.4.1'
+gem 'rack-attack', '~> 4.4', '>= 4.4.1'
# Ace editor
-gem 'ace-rails-ap', '~> 4.1.0'
+gem 'ace-rails-ap', '~> 4.1'
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.5'
@@ -281,10 +281,10 @@
@@ -279,10 +279,10 @@
gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0'
@ -284,16 +280,22 @@ gitlab Gemfile
gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.2'
@@ -296,7 +296,7 @@
@@ -292,12 +292,12 @@
gem "gitlab-license", "~> 1.0"
# Protect against bruteforcing
-gem 'rack-attack', '~> 6.2.0'
+gem 'rack-attack', '~> 6.2'
# Sentry integration
gem 'sentry-raven', '~> 2.9'
-gem 'premailer-rails', '~> 1.9.7'
+gem 'premailer-rails', '~> 1.9', '>=1.9.7'
-gem 'premailer-rails', '~> 1.10.3'
+gem 'premailer-rails', '~> 1.10', '>= 1.10.3'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.5'
@@ -304,11 +304,11 @@
@@ -305,11 +305,11 @@
# I18n
gem 'ruby_parser', '~> 3.8', require: false
gem 'rails-i18n', '~> 5.1'
@ -308,7 +310,7 @@ gitlab Gemfile
# Perf bar
# https://gitlab.com/gitlab-org/gitlab/issues/13996
@@ -426,11 +426,11 @@
@@ -431,11 +431,11 @@
gem 'oauth2', '~> 1.4'
# Health check
@ -323,21 +325,21 @@ gitlab Gemfile
# NTP client
gem 'net-ntp'
@@ -446,13 +446,13 @@
@@ -451,13 +451,13 @@
end
# Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 1.65.0'
+gem 'gitaly', '~> 1.65'
-gem 'gitaly', '~> 1.70.0'
+gem 'gitaly', '~> 1.70'
-gem 'grpc', '~> 1.19.0'
+gem 'grpc', '~> 1.19'
-gem 'grpc', '~> 1.24.0'
+gem 'grpc', '~> 1.24'
-gem 'google-protobuf', '~> 3.7.1'
+gem 'google-protobuf', '~> 3.7', '>= 3.7.1'
-gem 'google-protobuf', '~> 3.8.0'
+gem 'google-protobuf', '~> 3.8'
-gem 'toml-rb', '~> 1.0.0', require: false
+gem 'toml-rb', '~> 1.0', require: false
# Feature toggles
gem 'flipper', '~> 0.13.0'
gem 'flipper', '~> 0.17.1'

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

@ -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'
@@ -306,7 +305,6 @@
@@ -307,7 +306,6 @@
gem 'rails-i18n', '~> 5.1'
gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.3'
@ -18,12 +18,11 @@ Bundler will fail when it can't find these locally
gem 'batch-loader', '~> 1.4'
@@ -330,22 +328,6 @@
@@ -331,21 +329,6 @@
gem 'raindrops', '~> 0.18'
end
-group :development do
- gem 'foreman', '~> 0.84.0'
- gem 'brakeman', '~> 4.2', require: false
- gem 'danger', '~> 6.0', require: false
-

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -328,7 +328,7 @@
@@ -329,7 +329,7 @@
gem 'raindrops', '~> 0.18'
end
@ -9,12 +9,17 @@
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 @@
@@ -378,14 +378,10 @@
gem 'simple_po_parser', '~> 1.1.2', require: false
gem 'timecop', '~> 0.8.0'
-end
# Gems required in omnibus-gitlab pipeline
-group :development, :test, :omnibus do
gem 'license_finder', '~> 5.4', require: false
-end
-group :test do
gem 'shoulda-matchers', '~> 4.0.1', require: false
gem 'email_spec', '~> 2.2.0'

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -189,7 +189,7 @@
@@ -190,7 +190,7 @@
gem 'fugit', '~> 1.2', '>= 1.2.1'
# HTTP requests

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

@ -3,7 +3,7 @@
@@ -136,7 +136,6 @@
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
gem 'deckar01-task_list', '2.2'
gem 'deckar01-task_list', '~> 2.2', '>= 2.2.1'
-gem 'gitlab-markup', '~> 1.7'
gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.17'

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -166,12 +166,6 @@
@@ -167,12 +167,6 @@
gem 'unicorn-worker-killer', '~> 0.4.4'
end
@ -11,5 +11,5 @@
-end
-
# State machine
gem 'state_machines-activerecord', '~> 0.5.1'
gem 'state_machines-activerecord', '~> 0.6.0'

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -322,7 +322,6 @@
@@ -323,7 +323,6 @@
end
if ENV["INCLUDE_TEST_DEPENDS"] == "true"

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -309,7 +309,8 @@
@@ -310,7 +310,8 @@
gem 'snowplow-tracker', '~> 0.6.1'
# Memory benchmarks

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -303,7 +303,7 @@
@@ -304,7 +304,7 @@
# Perf bar
# https://gitlab.com/gitlab-org/gitlab/issues/13996

6
debian/patches/0482-remove-ee-only-gems.patch vendored
View file

@ -10,12 +10,12 @@
# Spam and anti-bot protection
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 2.0'
@@ -283,8 +280,6 @@
@@ -281,8 +278,6 @@
gem 'request_store', '~> 1.3'
gem 'base32', '~> 0.3.0'
-gem "gitlab-license", "~> 1.0"
-
# Sentry integration
gem 'sentry-raven', '~> 2.9'
# Protect against bruteforcing
gem 'rack-attack', '~> 6.2'

11
debian/patches/0483-relax-kubeclient.patch vendored
View file

@ -1,11 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -236,7 +236,7 @@
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
-gem 'kubeclient', '~> 4.4'
+gem 'kubeclient', '~> 4.3'
# Sanitize user input
gem 'sanitize', '~> 4.6'

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

@ -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)
@@ -1096,7 +1096,7 @@
@@ -1122,7 +1122,7 @@
asana (~> 0.8.1)
asciidoctor (~> 2.0.10)
asciidoctor-include-ext (~> 0.3.1)

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

@ -1,6 +1,6 @@
--- a/package.json
+++ b/package.json
@@ -146,63 +146,7 @@
@@ -147,64 +147,7 @@
"xterm": "^3.5.0"
},
"devDependencies": {
@ -32,6 +32,7 @@
- "jasmine-diff": "^0.1.3",
- "jasmine-jquery": "^2.1.1",
- "jest": "^24.1.0",
- "jest-canvas-mock": "^2.1.2",
- "jest-environment-jsdom": "^24.0.0",
- "jest-junit": "^6.3.0",
- "jest-util": "^24.0.0",

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

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

@ -23,7 +23,7 @@
},
module: {
@@ -370,19 +369,6 @@
@@ -375,19 +374,6 @@
// 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),
@@ -408,6 +394,7 @@
@@ -413,6 +399,7 @@
node: {
fs: 'empty', // sqljs requires fs

24
debian/patches/0760-bump-rubyzip.patch vendored
View file

@ -9,28 +9,8 @@ Last-Update: 2019-11-19
# GitLab Pages
gem 'validates_hostname', '~> 1.0', '>= 1.0.6'
-gem 'rubyzip', '~> 1.2', '>= 1.2.2', require: 'zip'
+gem 'rubyzip', '~> 2.0', '>= 2.0.0', require: 'zip'
-gem 'rubyzip', '~> 1.3', require: 'zip'
+gem 'rubyzip', '~> 2.0', require: 'zip'
# GitLab Pages letsencrypt support
gem 'acme-client', '~> 2.0', '>= 2.0.2'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -901,7 +901,7 @@
sexp_processor (~> 4.9)
rubyntlm (0.6.2)
rubypants (0.2.0)
- rubyzip (1.2.2)
+ rubyzip (2.0.0)
rugged (0.28.3.1)
safe_yaml (1.0.4)
sanitize (4.6.6)
@@ -1291,7 +1291,7 @@
ruby-prof (~> 1.0.0)
ruby-progressbar
ruby_parser (~> 3.8)
- rubyzip (~> 1.2.2)
+ rubyzip (~> 2.0.0)
rugged (~> 0.28)
sanitize (~> 4.6)
sassc-rails (~> 2.1.0)

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

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

1
debian/patches/series vendored
View file

@ -13,7 +13,6 @@
0480-embed-faraday-middleware-aws-signers-v4.patch
0480-embed-gitlab-peek.patch
0482-remove-ee-only-gems.patch
0483-relax-kubeclient.patch
0484-relax-asciidoctor-plantuml.patch
0500-set-webpack-root.patch
0510-remove-dev-dependencies.patch