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:
Sruthi Chandran 2018-12-24 00:09:40 +05:30
parent 765f748f62
commit db132aedf0
18 changed files with 72 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,22 +3,16 @@ gitlab Gemfile
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@
gem_versions = {}
gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2'
-gem_versions['default_value_for'] = rails5? ? '~> 3.0.5' : '~> 3.0.0'
+gem_versions['default_value_for'] = rails5? ? '~> 3.0.5' : '~> 3.0'
gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.10'
gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9'
# --- The end of special code for migrating to Rails 5.0 ---
@@ -13,12 +13,12 @@
@@ -17,7 +17,7 @@
source 'https://rubygems.org'
gem 'rails', gem_versions['rails']
-gem 'rails-deprecated_sanitizer', '~> 1.0.3'
+gem 'rails-deprecated_sanitizer', '~> 1.0', '>= 1.0.3'
# Improves copy-on-write performance for MRI
gem 'nakayoshi_fork', '~> 0.0.4'
@@ -25,7 +25,7 @@
# Responders respond_to and respond_with
gem 'responders', '~> 2.0'
@ -26,8 +20,8 @@ gitlab Gemfile
+gem 'sprockets', '~> 3.7'
# Default values for AR models
gem 'default_value_for', gem_versions['default_value_for']
@@ -37,35 +37,35 @@
if rails5?
@@ -48,35 +48,35 @@
gem 'doorkeeper', '~> 4.3'
gem 'doorkeeper-openid_connect', '~> 1.5'
gem 'omniauth', '~> 1.8'
@ -74,7 +68,7 @@ gitlab Gemfile
# Browser detection
gem 'browser', '~> 2.5'
@@ -76,17 +76,17 @@
@@ -87,17 +87,17 @@
# 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
@ -83,7 +77,7 @@ gitlab Gemfile
gem 'net-ldap'
# API
gem 'grape', '~> 1.1'
gem 'grape', '~> 1.1.0'
gem 'grape-entity', '~> 0.7.1'
-gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
+gem 'rack-cors', '~> 1.0', require: 'rack/cors'
@ -96,7 +90,7 @@ gitlab Gemfile
# Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes'
@@ -95,7 +95,7 @@
@@ -106,7 +106,7 @@
gem 'kaminari', '~> 1.0'
# HAML
@ -105,7 +99,7 @@ gitlab Gemfile
# Files attachments
# Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332/files is merged.
@@ -104,9 +104,9 @@
@@ -115,9 +115,9 @@
gem 'mini_magick'
# for backups
@ -117,7 +111,7 @@ gitlab Gemfile
gem 'fog-local', '~> 0.3'
gem 'fog-openstack', '~> 0.1'
gem 'fog-rackspace', '~> 0.1.1'
@@ -119,37 +119,37 @@
@@ -130,39 +130,39 @@
gem 'unf', '~> 0.1.4'
# Seed data
@ -128,7 +122,7 @@ gitlab Gemfile
gem 'html-pipeline', '~> 2.8'
-gem 'deckar01-task_list', '2.0.0'
+gem 'deckar01-task_list', '2.0'
gem 'gitlab-markup', '~> 1.6.4'
gem 'gitlab-markup', '~> 1.6.5'
-gem 'github-markup', '~> 1.7.0', require: 'github/markup'
+gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'redcarpet', '~> 3.4'
@ -139,9 +133,9 @@ gitlab Gemfile
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
-gem 'asciidoctor', '~> 1.5.6'
-gem 'asciidoctor', '~> 1.5.8'
-gem 'asciidoctor-plantuml', '0.0.8'
+gem 'asciidoctor', '~> 1.5', '>= 1.5.6'
+gem 'asciidoctor', '~> 1.5', '>= 1.5.8'
+gem 'asciidoctor-plantuml', '~> 0.0.8'
gem 'rouge', '~> 3.1'
gem 'truncato', '~> 0.7.9'
@ -159,25 +153,27 @@ gitlab Gemfile
+gem 'diffy', '~> 3.1'
# Application server
gem 'rack', gem_versions['rack']
group :unicorn do
- gem 'unicorn', '~> 5.1.0'
+ gem 'unicorn', '~> 5.1'
gem 'unicorn-worker-killer', '~> 0.4.4'
end
@@ -165,9 +165,9 @@
@@ -178,9 +178,9 @@
gem 'acts-as-taggable-on', '~> 5.0'
# Background jobs
-gem 'sidekiq', '~> 5.2.1'
+gem 'sidekiq', '~> 5.2','>= 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 'gitlab-sidekiq-fetcher', '~> 0.1.0', require: 'sidekiq-reliable-fetch'
# Cron Parser
gem 'rufus-scheduler', '~> 3.4'
@@ -182,14 +182,14 @@
@@ -196,14 +196,14 @@
gem 'ruby-progressbar'
# GitLab settings
@ -195,7 +191,7 @@ gitlab Gemfile
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 2.2.1'
@@ -198,14 +198,14 @@
@@ -212,7 +212,7 @@
gem 'device_detector'
# Cache
@ -204,7 +200,8 @@ gitlab Gemfile
# Redis
gem 'redis', '~> 3.2'
gem 'connection_pool', '~> 2.0'
@@ -222,7 +222,7 @@
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
# HipChat integration
-gem 'hipchat', '~> 1.5.0'
@ -212,7 +209,7 @@ gitlab Gemfile
# JIRA integration
gem 'jira-ruby', '~> 1.4'
@@ -214,7 +214,7 @@
@@ -231,7 +231,7 @@
gem 'flowdock', '~> 0.7'
# Slack integration
@ -221,12 +218,12 @@ gitlab Gemfile
# Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5'
@@ -226,11 +226,11 @@
@@ -243,11 +243,11 @@
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
-gem 'kubeclient', '~> 3.1.0'
+gem 'kubeclient', '~> 3.1'
-gem 'kubeclient', '~> 4.0.0'
+gem 'kubeclient', '~> 4.0'
# Sanitize user input
gem 'sanitize', '~> 4.6'
@ -235,7 +232,7 @@ gitlab Gemfile
# Sanitizes SVG input
gem 'loofah', '~> 2.2'
@@ -239,10 +239,10 @@
@@ -256,10 +256,10 @@
gem 'licensee', '~> 8.9'
# Protect against bruteforcing
@ -248,7 +245,7 @@ gitlab Gemfile
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.5'
@@ -257,40 +257,40 @@
@@ -277,40 +277,40 @@
gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0'
@ -285,8 +282,8 @@ gitlab Gemfile
gem 'gettext_i18n_rails_js', '~> 1.3'
gem 'gettext', '~> 3.2.2', require: false, group: :development
-gem 'batch-loader', '~> 1.2.1'
+gem 'batch-loader', '~> 1.2', '>= 1.2.1'
-gem 'batch-loader', '~> 1.2.2'
+gem 'batch-loader', '~> 1.2', '>= 1.2.2'
# Perf bar
-gem 'peek', '~> 1.0.1'
@ -299,10 +296,10 @@ gitlab Gemfile
gem 'peek-rblineprof', '~> 0.2.0'
-gem 'peek-redis', '~> 1.2.0'
+gem 'peek-redis', '~> 1.2'
gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch'
# Metrics
@@ -399,15 +399,15 @@
group :metrics do
@@ -418,15 +418,15 @@
gem 'oauth2', '~> 1.4'
# Health check
@ -322,13 +319,13 @@ gitlab Gemfile
# Required for ED25519 SSH host key support
group :ed25519 do
@@ -416,12 +416,12 @@
@@ -435,12 +435,12 @@
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.123.0', require: 'gitaly'
-gem 'gitaly-proto', '~> 1.3.0', require: 'gitaly'
-gem 'grpc', '~> 1.15.0'
+gem 'gitaly-proto', '~> 0.123', require: 'gitaly'
+gem 'gitaly-proto', '~> 1.3', require: 'gitaly'
+gem 'grpc', '~> 1.15'
gem 'google-protobuf', '~> 3.6'

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
@@ -280,7 +280,6 @@
@@ -300,7 +300,6 @@
gem 'rails-i18n', gem_versions['rails-i18n']
gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.3'
-gem 'gettext', '~> 3.2.2', require: false, group: :development
gem 'batch-loader', '~> 1.2', '>= 1.2.1'
gem 'batch-loader', '~> 1.2', '>= 1.2.2'
@@ -303,21 +302,6 @@
@@ -322,21 +321,6 @@
gem 'raindrops', '~> 0.18'
end
@ -22,8 +22,8 @@ Bundler will fail when it can't find these locally
- gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
-
- # Better errors handler
- gem 'better_errors', '~> 2.1.0'
- gem 'binding_of_caller', '~> 0.7.2'
- gem 'better_errors', '~> 2.5.0'
- gem 'binding_of_caller', '~> 0.8.0'
-
- # thin instead webrick
- gem 'thin', '~> 1.7.0'

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

@ -9,8 +9,8 @@ Subject: [PATCH] allow specifying DB choice via ENV variable
--- a/Gemfile
+++ b/Gemfile
@@ -24,8 +24,9 @@
gem 'default_value_for', gem_versions['default_value_for']
@@ -35,8 +35,9 @@
end
# Supported DBs
-gem 'mysql2', '~> 0.4.10', group: :mysql

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -303,7 +303,7 @@
@@ -322,7 +322,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
@@ -355,9 +355,9 @@
@@ -374,9 +374,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
@@ -361,7 +361,7 @@
@@ -380,7 +380,7 @@
gem 'shoulda-matchers', '~> 3.1.2', require: false
gem 'email_spec', '~> 2.2.0'
gem 'json-schema', '~> 2.8.0'

2
debian/patches/0280-relax-pg.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,7 @@
@@ -37,7 +37,7 @@
# Supported DBs
ENV["DB"] ||= "postgresql"
gem 'mysql2', '~> 0.4.10' if ENV["DB"] == "all" || ENV["DB"] == "mysql"

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -287,7 +287,6 @@
@@ -307,7 +307,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
@@ -174,7 +174,7 @@
@@ -188,7 +188,7 @@
gem 'rufus-scheduler', '~> 3.4'
# HTTP requests

4
debian/patches/0400-Relax-recaptcha-version.patch vendored
View file

@ -6,11 +6,9 @@ Subject: Relax recaptcha version
Gemfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile b/Gemfile
index 60d2709..0ab5c72 100644
--- a/Gemfile
+++ b/Gemfile
@@ -56,7 +56,7 @@ gem 'rack-oauth2', '~> 1.2', '>= 1.2.1'
@@ -67,7 +67,7 @@
gem 'jwt', '~> 1.5', '>= 1.5.6'
# Spam and anti-bot protection

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

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

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

@ -1,10 +1,10 @@
--- a/Gemfile
+++ b/Gemfile
@@ -125,7 +125,6 @@
@@ -136,7 +136,6 @@
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
gem 'deckar01-task_list', '2.0'
-gem 'gitlab-markup', '~> 1.6.4'
-gem 'gitlab-markup', '~> 1.6.5'
gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'redcarpet', '~> 3.4'
gem 'commonmarker', '~> 0.17'

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -153,11 +153,6 @@
@@ -166,11 +166,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
@@ -298,7 +298,6 @@
@@ -317,7 +317,6 @@
if ENV["INCLUDE_TEST_DEPENDS"] == "true"
gem 'bootsnap', '~> 1.3'

2
debian/patches/0460-relax-rspec-rails.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -306,7 +306,7 @@
@@ -325,7 +325,7 @@
gem 'database_cleaner', '~> 1.5.0'
gem 'factory_bot_rails', '~> 4.8.2'

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

@ -1,28 +1,38 @@
--- a/package.json
+++ b/package.json
@@ -111,35 +111,5 @@
@@ -118,45 +118,5 @@
"xterm": "^3.5.0"
},
"devDependencies": {
- "@gitlab/eslint-config": "^1.1.0",
- "@gitlab/eslint-config": "^1.2.0",
- "@vue/test-utils": "^1.0.0-beta.25",
- "axios-mock-adapter": "^1.15.0",
- "babel-core": "^7.0.0-bridge",
- "babel-jest": "^23.6.0",
- "babel-plugin-dynamic-import-node": "^2.2.0",
- "babel-plugin-istanbul": "^5.1.0",
- "babel-plugin-rewire": "^1.2.0",
- "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
- "babel-template": "^6.26.0",
- "babel-types": "^6.26.0",
- "chalk": "^2.4.1",
- "commander": "^2.18.0",
- "eslint": "~5.6.0",
- "eslint-import-resolver-jest": "^2.1.1",
- "eslint-import-resolver-webpack": "^0.10.1",
- "eslint-plugin-html": "4.0.5",
- "eslint-plugin-import": "^2.14.0",
- "eslint-plugin-jasmine": "^2.10.1",
- "eslint-plugin-jest": "^22.1.0",
- "gettext-extractor": "^3.3.2",
- "gettext-extractor-vue": "^4.0.1",
- "graphql-tag": "^2.10.0",
- "istanbul": "^0.4.5",
- "jasmine-core": "^2.9.0",
- "jasmine-diff": "^0.1.3",
- "jasmine-jquery": "^2.1.1",
- "jest": "^23.6.0",
- "jest-junit": "^5.2.0",
- "karma": "^3.0.0",
- "karma-chrome-launcher": "^2.2.0",
- "karma-coverage-istanbul-reporter": "^2.0.4",
@ -32,8 +42,7 @@
- "karma-sourcemap-loader": "^0.3.7",
- "karma-webpack": "^4.0.0-beta.0",
- "nodemon": "^1.18.4",
- "prettier": "1.14.3",
- "webpack-dev-server": "^3.1.8"
- }
+ }
- "prettier": "1.15.2",
- "webpack-dev-server": "^3.1.10"
}
}

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

@ -3,7 +3,7 @@
@@ -85,6 +85,7 @@
resolve: {
extensions: ['.js'],
extensions: ['.js', '.gql', '.graphql'],
+ modules: ['/usr/share/gitlab/node_modules','/usr/share/gitlab/node_modules/mermaid/node_modules', '/usr/lib/nodejs'],
alias: {
'~': path.join(ROOT_PATH, 'app/assets/javascripts'),

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

@ -1,19 +0,0 @@
Required to support updation from 8 to 10
Bug, upstream: https://gitlab.com/gitlab-org/gitlab-ce/issues/48040
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -242,6 +242,12 @@
# Disabled features are always off!
return false if status == MigrationStatus::DISABLED
+ # If the features table does not exist, don't check the feature, just return
+ # the default
+ unless Gitlab::Database.cached_table_exists?(Feature::FlipperFeature.table_name)
+ return false
+ end
+
feature = Feature.get("gitaly_#{feature_name}")
# If the feature has been set, always evaluate

1
debian/patches/series vendored
View file

@ -19,6 +19,5 @@
0620-pid-log-paths.patch
0630-fix-mail-room-path.patch
0640-relax-ruby-version.patch
0650-fix-8-to-10-migration.patch
0660-fix-gitlab-yml-path.patch
0670-allow-doorkeepr-4_3.patch