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-12-06 11:33:01 +05:30
parent cfd869b722
commit 086651cd74
12 changed files with 62 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,26 +74,28 @@ gitlab Gemfile
# Browser detection
gem 'browser', '~> 2.5'
@@ -86,15 +86,15 @@
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
@@ -84,16 +84,16 @@
gem 'gitlab-gollum-lib', '~> 4.2', require: false
# Language detection
-gem 'github-linguist', '~> 5.3.3', require: 'linguist'
+gem 'github-linguist', '~> 5.3', '>= 5.3.3', require: 'linguist'
# API
gem 'grape', '~> 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.8.0'
-gem 'graphiql-rails', '~> 1.4.10'
+gem 'graphql', '~> 1.8'
gem 'graphiql-rails', '~> 1.4.10'
+gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
# Disable strong_params so that Mash does not respond to :permitted?
@@ -104,7 +104,7 @@
gem 'hashie-forbidden_attributes'
@@ -102,7 +102,7 @@
gem 'kaminari', '~> 1.0'
# HAML
@ -102,8 +104,8 @@ gitlab Gemfile
# Files attachments
# Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332/files is merged.
@@ -116,9 +116,9 @@
gem 'dropzonejs-rails', '~> 0.7.1'
@@ -111,9 +111,9 @@
gem 'mini_magick'
# for backups
-gem 'fog-aws', '~> 2.0.1'
@ -114,7 +116,7 @@ gitlab Gemfile
gem 'fog-local', '~> 0.3'
gem 'fog-openstack', '~> 0.1'
gem 'fog-rackspace', '~> 0.1.1'
@@ -131,35 +131,35 @@
@@ -126,36 +126,36 @@
gem 'unf', '~> 0.1.4'
# Seed data
@ -124,9 +126,10 @@ gitlab Gemfile
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
-gem 'deckar01-task_list', '2.0.0'
-gem 'gitlab-markup', '~> 1.6.4'
+gem 'deckar01-task_list', '2.0'
+gem 'gitlab-markup', '~> 1.6', '>= 1.6.4'
gem 'gitlab-markup', '~> 1.6.4'
-gem 'github-markup', '~> 1.7.0', require: 'github/markup'
+gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'redcarpet', '~> 3.4'
gem 'commonmarker', '~> 0.17'
-gem 'RedCloth', '~> 4.3.2'
@ -136,9 +139,8 @@ gitlab Gemfile
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
-gem 'asciidoctor', '~> 1.5.6'
-gem 'asciidoctor-plantuml', '0.0.8'
+gem 'asciidoctor', '~> 1.5', '>= 1.5.6'
+gem 'asciidoctor-plantuml', '~> 0.0.8'
gem 'asciidoctor-plantuml', '0.0.8'
gem 'rouge', '~> 3.1'
gem 'truncato', '~> 0.7.9'
-gem 'bootstrap_form', '~> 2.7.0'
@ -160,16 +162,19 @@ gitlab Gemfile
gem 'unicorn-worker-killer', '~> 0.4.4'
end
@@ -172,7 +172,7 @@
@@ -166,9 +166,9 @@
gem 'acts-as-taggable-on', '~> 5.0'
# Background jobs
gem 'sidekiq', '~> 5.1'
-gem 'sidekiq', '~> 5.2.1'
+gem 'sidekiq', '~> 5.2','>= 5.2.1'
gem 'sidekiq-cron', '~> 0.6.0'
-gem 'redis-namespace', '~> 1.6.0'
+gem 'redis-namespace', '~> 1.6'
gem 'sidekiq-limit_fetch', '~> 3.4', require: false
# Cron Parser
@@ -188,14 +188,14 @@
gem 'rufus-scheduler', '~> 3.4'
@@ -183,14 +183,14 @@
gem 'ruby-progressbar'
# GitLab settings
@ -187,7 +192,7 @@ gitlab Gemfile
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 2.2.1'
@@ -204,23 +204,23 @@
@@ -199,23 +199,23 @@
gem 'device_detector'
# Cache
@ -215,7 +220,7 @@ gitlab Gemfile
# Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5'
@@ -232,11 +232,11 @@
@@ -227,11 +227,11 @@
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
@ -229,7 +234,7 @@ gitlab Gemfile
# Sanitizes SVG input
gem 'loofah', '~> 2.2'
@@ -245,13 +245,13 @@
@@ -240,13 +240,13 @@
gem 'licensee', '~> 8.9'
# Protect against bruteforcing
@ -246,7 +251,7 @@ gitlab Gemfile
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.5'
@@ -266,41 +266,41 @@
@@ -261,40 +261,40 @@
gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0'
@ -296,13 +301,11 @@ gitlab Gemfile
+gem 'peek-pg', '~> 1.3', group: :postgres
gem 'peek-rblineprof', '~> 0.2.0'
-gem 'peek-redis', '~> 1.2.0'
-gem 'peek-sidekiq', '~> 1.0.3'
+gem 'peek-redis', '~> 1.2'
+gem 'peek-sidekiq', '~> 1.0', '>= 1.0.3'
gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch'
# Metrics
group :metrics do
@@ -408,15 +408,15 @@
@@ -403,15 +403,15 @@
gem 'oauth2', '~> 1.4'
# Health check
@ -322,18 +325,18 @@ gitlab Gemfile
# Required for ED25519 SSH host key support
group :ed25519 do
@@ -425,13 +425,13 @@
@@ -420,13 +420,13 @@
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly'
-gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly'
-gem 'grpc', '~> 1.11.0'
+gem 'gitaly-proto', '~> 0.117', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.118', require: 'gitaly'
+gem 'grpc', '~> 1.11'
# Locked until https://github.com/google/protobuf/issues/4210 is closed
-gem 'google-protobuf', '= 3.5.1'
+gem 'google-protobuf', '~> 3.5', '>= 3.5.1'
+gem 'google-protobuf', '>= 3.5.1'
-gem 'toml-rb', '~> 1.0.0', require: false
+gem 'toml-rb', '~> 1.0', require: false

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
@@ -289,7 +289,6 @@
@@ -284,7 +284,6 @@
gem 'rails-i18n', gem_versions['rails-i18n']
gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.3'
@ -10,7 +10,7 @@ Bundler will fail when it can't find these locally
gem 'batch-loader', '~> 1.2', '>= 1.2.1'
@@ -312,21 +311,6 @@
@@ -307,21 +306,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
@@ -312,7 +312,7 @@
@@ -307,7 +307,7 @@
gem 'raindrops', '~> 0.18'
end
@ -9,7 +9,7 @@
gem 'bootsnap', '~> 1.3'
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.4.1', platform: :mri
@@ -364,9 +364,9 @@
@@ -359,9 +359,9 @@
gem 'simple_po_parser', '~> 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
@@ -370,7 +370,7 @@
@@ -365,7 +365,7 @@
gem 'shoulda-matchers', '~> 3.1.2', require: false
gem 'email_spec', '~> 2.2.0'
gem 'json-schema', '~> 2.8.0'

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

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

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

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

11
debian/patches/0410-relax-dropzonejs-rails.patch vendored
View file

@ -1,11 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -114,7 +114,7 @@
gem 'mini_magick'
# Drag and Drop UI
-gem 'dropzonejs-rails', '~> 0.7.1'
+gem 'dropzonejs-rails', '~> 0.7'
# for backups
gem 'fog-aws', '~> 2.0', '>= 2.0.1'

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -199,7 +199,7 @@
@@ -194,7 +194,7 @@
gem 'version_sorter', '~> 2.1'
# Export Ruby Regex to Javascript

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

@ -1,26 +1,26 @@
--- a/package.json
+++ b/package.json
@@ -109,39 +109,5 @@
@@ -111,40 +111,5 @@
"xterm": "^3.5.0"
},
"devDependencies": {
- "axios-mock-adapter": "^1.15.0",
- "babel-eslint": "^8.2.3",
- "babel-plugin-istanbul": "^4.1.6",
- "babel-plugin-rewire": "^1.1.0",
- "babel-eslint": "^9.0.0",
- "babel-plugin-istanbul": "^5.1.0",
- "babel-plugin-rewire": "^1.2.0",
- "babel-template": "^6.26.0",
- "babel-types": "^6.26.0",
- "chalk": "^2.4.1",
- "commander": "^2.15.1",
- "eslint": "~4.12.1",
- "eslint-config-airbnb-base": "^12.1.0",
- "eslint-import-resolver-webpack": "^0.10.0",
- "eslint-plugin-filenames": "^1.2.0",
- "eslint-plugin-html": "4.0.3",
- "eslint-plugin-import": "^2.12.0",
- "eslint-plugin-jasmine": "^2.1.0",
- "eslint-plugin-promise": "^3.8.0",
- "eslint-plugin-vue": "^4.5.0",
- "commander": "^2.18.0",
- "eslint": "~5.6.0",
- "eslint-config-airbnb-base": "^13.1.0",
- "eslint-import-resolver-webpack": "^0.10.1",
- "eslint-plugin-filenames": "^1.3.2",
- "eslint-plugin-html": "4.0.5",
- "eslint-plugin-import": "^2.14.0",
- "eslint-plugin-jasmine": "^2.10.1",
- "eslint-plugin-promise": "^4.0.1",
- "eslint-plugin-vue": "^5.0.0-beta.3",
- "gettext-extractor": "^3.3.2",
- "gettext-extractor-vue": "^4.0.1",
- "ignore": "^3.3.7",
@ -28,15 +28,17 @@
- "jasmine-core": "^2.9.0",
- "jasmine-diff": "^0.1.3",
- "jasmine-jquery": "^2.1.1",
- "karma": "^2.0.4",
- "karma": "^3.0.0",
- "karma-chrome-launcher": "^2.2.0",
- "karma-coverage-istanbul-reporter": "^1.4.2",
- "karma-coverage-istanbul-reporter": "^2.0.4",
- "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",
- "nodemon": "^1.18.2",
- "nodemon": "^1.18.4",
- "prettier": "1.12.1",
- "webpack-dev-server": "^3.1.4"
}
- "webpack-dev-server": "^3.1.8"
- }
+ }
}

2
debian/patches/0650-fix-8-to-10-migration.patch vendored
View file

@ -4,7 +4,7 @@ Bug, upstream: https://gitlab.com/gitlab-org/gitlab-ce/issues/48040
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -226,6 +226,12 @@
@@ -240,6 +240,12 @@
# Disabled features are always off!
return false if status == MigrationStatus::DISABLED

2
debian/patches/0670-allow-doorkeepr-4_3.patch vendored
View file

@ -2,7 +2,7 @@ Bug, https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22966
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -107,15 +107,6 @@
@@ -114,15 +114,6 @@
base_controller '::Gitlab::BaseDoorkeeperController'
end

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
0410-relax-dropzonejs-rails.patch
0420-relax-js-regex.patch
0500-set-webpack-root.patch
0510-remove-dev-dependencies.patch