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

Refresh patches, remove 0420-relax-js-regex.patch already applied upstream

Browse source
This commit is contained in:
Sruthi Chandran 2019-03-02 23:07:12 +05:30
parent d461da30b8
commit fabb91da5b
14 changed files with 48 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -117,7 +117,7 @@ gitlab Gemfile
gem 'fog-local', '~> 0.3'
gem 'fog-openstack', '~> 0.1'
gem 'fog-rackspace', '~> 0.1.1'
@@ -109,33 +109,33 @@
@@ -109,32 +109,32 @@
gem 'unf', '~> 0.1.4'
# Seed data
@ -126,13 +126,12 @@ gitlab Gemfile
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
-gem 'deckar01-task_list', '2.0.0'
-gem 'deckar01-task_list', '2.2.0'
-gem 'gitlab-markup', '~> 1.6.5'
-gem 'github-markup', '~> 1.7.0', require: 'github/markup'
+gem 'deckar01-task_list', '2.0'
+gem 'gitlab-markup', '~> 1.6', '>= 1.6.5'
+gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'redcarpet', '~> 3.4'
gem 'commonmarker', '~> 0.17'
-gem 'RedCloth', '~> 4.3.2'
+gem 'RedCloth', '~> 4.3', '>= 4.3.2'
@ -144,11 +143,11 @@ gitlab Gemfile
+gem 'asciidoctor', '~> 1.5', '>= 1.5.8'
gem 'asciidoctor-plantuml', '0.0.8'
gem 'rouge', '~> 3.1'
gem 'truncato', '~> 0.7.9'
gem 'truncato', '~> 0.7.11'
-gem 'bootstrap_form', '~> 2.7.0'
-gem 'nokogiri', '~> 1.8.5'
-gem 'nokogiri', '~> 1.10.1'
+gem 'bootstrap_form', '~> 2.7'
+gem 'nokogiri', '~> 1.8', '>= 1.8.5'
+gem 'nokogiri', '~> 1.10', '>= 1.10.1'
gem 'escape_utils', '~> 1.1'
# Calendar rendering
@ -160,7 +159,7 @@ gitlab Gemfile
# Application server
# The 2.0.6 version of rack requires monkeypatch to be present in
@@ -144,7 +144,7 @@
@@ -143,7 +143,7 @@
gem 'rack', '2.0.6'
group :unicorn do
@ -169,19 +168,19 @@ gitlab Gemfile
gem 'unicorn-worker-killer', '~> 0.4.4'
end
@@ -160,9 +160,9 @@
@@ -159,9 +159,9 @@
gem 'acts-as-taggable-on', '~> 5.0'
# Background jobs
-gem 'sidekiq', '~> 5.2.1'
+gem 'sidekiq', '~> 5.2', '>= 5.2.1'
gem 'sidekiq-cron', '~> 0.6.0'
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'
# Cron Parser
@@ -178,23 +178,23 @@
@@ -177,14 +177,14 @@
gem 'ruby-progressbar'
# GitLab settings
@ -198,10 +197,8 @@ gitlab Gemfile
+gem 'version_sorter', '~> 2.1'
# Export Ruby Regex to Javascript
-gem 'js_regex', '~> 2.2.1'
+gem 'js_regex', '~> 2.2', '>= 2.2.1'
# User agent parsing
gem 'js_regex', '~> 3.1'
@@ -193,7 +193,7 @@
gem 'device_detector'
# Cache
@ -210,7 +207,7 @@ gitlab Gemfile
# Redis
gem 'redis', '~> 3.2'
@@ -204,7 +204,7 @@
@@ -203,7 +203,7 @@
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
# HipChat integration
@ -219,7 +216,7 @@ gitlab Gemfile
# JIRA integration
gem 'jira-ruby', '~> 1.4'
@@ -213,7 +213,7 @@
@@ -212,7 +212,7 @@
gem 'flowdock', '~> 0.7'
# Slack integration
@ -228,12 +225,12 @@ gitlab Gemfile
# Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5'
@@ -225,11 +225,11 @@
@@ -224,11 +224,11 @@
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
-gem 'kubeclient', '~> 4.0.0'
+gem 'kubeclient', '~> 4.0'
-gem 'kubeclient', '~> 4.2.2'
+gem 'kubeclient', '~> 4.2', '>= 4.2.2'
# Sanitize user input
gem 'sanitize', '~> 4.6'
@ -242,7 +239,7 @@ gitlab Gemfile
# Sanitizes SVG input
gem 'loofah', '~> 2.2'
@@ -238,10 +238,10 @@
@@ -237,10 +237,10 @@
gem 'licensee', '~> 8.9'
# Protect against bruteforcing
@ -255,7 +252,7 @@ gitlab Gemfile
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.5'
@@ -259,41 +259,41 @@
@@ -258,41 +258,41 @@
gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0'
@ -311,7 +308,7 @@ gitlab Gemfile
# Metrics
group :metrics do
@@ -313,54 +313,54 @@
@@ -318,54 +318,54 @@
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
# Better errors handler
@ -381,7 +378,7 @@ gitlab Gemfile
gem 'license_finder', '~> 5.4', require: false
gem 'knapsack', '~> 1.17'
@@ -369,18 +369,18 @@
@@ -374,18 +374,18 @@
gem 'stackprof', '~> 0.2.10', require: false
@ -406,7 +403,7 @@ gitlab Gemfile
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.2.5'
gem 'rspec_junit_formatter'
@@ -400,15 +400,15 @@
@@ -405,15 +405,15 @@
gem 'oauth2', '~> 1.4'
# Health check
@ -426,13 +423,13 @@ gitlab Gemfile
# Required for ED25519 SSH host key support
group :ed25519 do
@@ -417,12 +417,12 @@
@@ -422,12 +422,12 @@
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly'
-gem 'gitaly-proto', '~> 1.10.0', require: 'gitaly'
-gem 'grpc', '~> 1.15.0'
+gem 'gitaly-proto', '~> 1.5', require: 'gitaly'
+gem 'gitaly-proto', '~> 1.10', require: 'gitaly'
+gem 'grpc', '~> 1.15'
gem 'google-protobuf', '~> 3.6'

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

@ -14,7 +14,7 @@ Subject: [PATCH] allow specifying DB choice via ENV variable
# Supported DBs
-gem 'mysql2', '~> 0.4.10', group: :mysql
-gem 'pg', '~> 0.18.2', group: :postgres
-gem 'pg', '~> 1.1', group: :postgres
+ENV["DB"] ||= "postgresql"
+gem 'mysql2', '~> 0.4.10' if ENV["DB"] == "all" || ENV["DB"] == "mysql"
+gem 'pg', '~> 0.18.2' if ENV["DB"] == "all" || ENV["DB"] == "postgres"

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

@ -1,7 +1,7 @@
--- a/Gemfile
+++ b/Gemfile
@@ -305,7 +305,7 @@
gem 'raindrops', '~> 0.18'
@@ -310,7 +310,7 @@
gem 'jaeger-client', '~> 0.10.0'
end
-group :development, :test do
@ -9,7 +9,7 @@
gem 'bootsnap', '~> 1.3'
gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri
@@ -357,9 +357,9 @@
@@ -362,9 +362,9 @@
gem 'simple_po_parser', '~> 1.1', '>= 1.1.2', require: false
gem 'timecop', '~> 0.8.0'

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -363,7 +363,7 @@
@@ -368,7 +368,7 @@
gem 'shoulda-matchers', '~> 3.1', '>= 3.1.2', require: false
gem 'email_spec', '~> 2.2'
gem 'json-schema', '~> 2.8'

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -290,7 +290,6 @@
@@ -289,7 +289,6 @@
# Perf bar
gem 'peek', '~> 1.0', '>= 1.0.1'
gem 'peek-gc', '~> 0.0.2'

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

@ -1,7 +1,7 @@
--- a/Gemfile
+++ b/Gemfile
@@ -170,7 +170,7 @@
gem 'rufus-scheduler', '~> 3.4'
@@ -169,7 +169,7 @@
gem 'fugit', '~> 1.1'
# HTTP requests
-gem 'httparty', '~> 0.13.3'

11
debian/patches/0420-relax-js-regex.patch vendored
View file

@ -1,11 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -189,7 +189,7 @@
gem 'version_sorter', '~> 2.1'
# Export Ruby Regex to Javascript
-gem 'js_regex', '~> 2.2', '>= 2.2.1'
+gem 'js_regex', '~> 3.1'
# User agent parsing
gem 'device_detector'

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

@ -6,5 +6,5 @@
gem 'deckar01-task_list', '2.0'
-gem 'gitlab-markup', '~> 1.6', '>= 1.6.5'
gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'redcarpet', '~> 3.4'
gem 'commonmarker', '~> 0.17'
gem 'RedCloth', '~> 4.3', '>= 4.3.2'

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -148,11 +148,6 @@
@@ -147,11 +147,6 @@
gem 'unicorn-worker-killer', '~> 0.4.4'
end

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -300,7 +300,6 @@
@@ -305,7 +305,6 @@
if ENV["INCLUDE_TEST_DEPENDS"] == "true"
gem 'bootsnap', '~> 1.3'

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

@ -1,6 +1,6 @@
--- a/package.json
+++ b/package.json
@@ -118,48 +118,6 @@
@@ -126,52 +126,6 @@
"xterm": "^3.5.0"
},
"devDependencies": {
@ -17,6 +17,7 @@
- "babel-types": "^6.26.0",
- "chalk": "^2.4.1",
- "commander": "^2.18.0",
- "docdash": "^1.0.2",
- "eslint": "~5.9.0",
- "eslint-import-resolver-jest": "^2.1.1",
- "eslint-import-resolver-webpack": "^0.10.1",
@ -33,6 +34,8 @@
- "jasmine-jquery": "^2.1.1",
- "jest": "^23.6.0",
- "jest-junit": "^5.2.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",
@ -41,11 +44,12 @@
- "karma-mocha-reporter": "^2.2.5",
- "karma-sourcemap-loader": "^0.3.7",
- "karma-webpack": "^4.0.0-beta.0",
- "nodemon": "^1.18.4",
- "prettier": "1.15.2",
- "vue-jest": "^3.0.1",
- "webpack-dev-server": "^3.1.10",
- "yarn-deduplicate": "^1.0.5"
- "nodemon": "^1.18.9",
- "pixelmatch": "^4.0.2",
- "prettier": "1.16.1",
- "vue-jest": "^3.0.2",
- "webpack-dev-server": "^3.1.14",
- "yarn-deduplicate": "^1.1.0"
},
"engines": {
"yarn": "^1.10.0"
"node": ">=8.10.0",

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

@ -8,7 +8,7 @@
alias: {
'~': path.join(ROOT_PATH, 'app/assets/javascripts'),
emojis: path.join(ROOT_PATH, 'fixtures/emojis'),
@@ -97,6 +98,10 @@
@@ -100,6 +101,10 @@
},
},

2
debian/patches/0700-add-salsa-link-to-help.patch vendored
View file

@ -5,7 +5,7 @@ Last-Update: 2018-12-16
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/app/helpers/version_check_helper.rb
+++ b/app/helpers/version_check_helper.rb
@@ -11,7 +11,10 @@
@@ -10,7 +10,10 @@
end
def link_to_version

1
debian/patches/series vendored
View file

@ -7,7 +7,6 @@
0290-skip-peek-mysql2.patch
0340-relax-httparty.patch
0400-Relax-recaptcha-version.patch
0420-relax-js-regex.patch
0430-remove-gitlab-markup.patch
0440-remove-puma.patch
0450-remove-bullet.patch