Refresh and rename patches

debian/patches/0050-relax-stable-libs.patch

@@ -45,11 +45,10 @@ gitlab Gemfile
  gem 'omniauth-azure-oauth2', '~> 0.0.9'
 -gem 'omniauth-cas3', '~> 1.1.4'
 -gem 'omniauth-facebook', '~> 4.0.0'
--gem 'omniauth-github', '~> 1.1.1'
--gem 'omniauth-gitlab', '~> 1.0.2'
 +gem 'omniauth-cas3', '~> 1.1', '>= 1.1.4'
 +gem 'omniauth-facebook', '~> 4.0'
-+gem 'omniauth-github', '~> 1.1', '>= 1.1.1'
+ gem 'omniauth-github', '~> 1.3'
+-gem 'omniauth-gitlab', '~> 1.0.2'
 +gem 'omniauth-gitlab', '~> 1.0', '>= 1.0.2'
  gem 'omniauth-google-oauth2', '~> 0.5.3'
  gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
@@ -93,7 +92,7 @@ gitlab Gemfile
  
  # API
  gem 'grape', '~> 1.0'
- gem 'grape-entity', '~> 0.6.0'
+ gem 'grape-entity', '~> 0.7.1'
 -gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
 +gem 'rack-cors', '~> 1.0', require: 'rack/cors'
  
@@ -108,15 +107,18 @@ gitlab Gemfile
  
  # Files attachments
  gem 'carrierwave', '~> 1.2'
-@@ -109,7 +109,7 @@
+@@ -109,9 +109,9 @@
  gem 'dropzonejs-rails', '~> 0.7.1'
  
  # for backups
 -gem 'fog-aws', '~> 2.0.1'
 +gem 'fog-aws', '~> 2.0', '>= 2.0.1'
  gem 'fog-core', '~> 1.44'
- gem 'fog-google', '~> 1.3.3'
+-gem 'fog-google', '~> 1.3.3'
++gem 'fog-google', '~> 1.3', '>= 1.3.3'
  gem 'fog-local', '~> 0.3'
+ gem 'fog-openstack', '~> 0.1'
+ gem 'fog-rackspace', '~> 0.1.1'
 @@ -124,32 +124,32 @@
  gem 'unf', '~> 0.1.4'
  
@@ -169,7 +171,7 @@ gitlab Gemfile
  gem 'sidekiq-limit_fetch', '~> 3.4', require: false
  
  # Cron Parser
-@@ -175,36 +175,36 @@
+@@ -175,39 +175,39 @@
  gem 'rainbow', '~> 2.2'
  
  # GitLab settings
@@ -185,6 +187,9 @@ gitlab Gemfile
 -gem 'version_sorter', '~> 2.1.0'
 +gem 'version_sorter', '~> 2.1'
  
+ # User agent parsing
+ gem 'device_detector'
+ 
  # Cache
 -gem 'redis-rails', '~> 5.0.2'
 +gem 'redis-rails', '~> 5.0', '>= 5.0.2'
@@ -213,7 +218,7 @@ gitlab Gemfile
  
  # Asana integration
  gem 'asana', '~> 0.6.0'
-@@ -216,11 +216,11 @@
+@@ -219,11 +219,11 @@
  gem 'kubeclient', '~> 3.0'
  
  # d3
@@ -228,7 +233,7 @@ gitlab Gemfile
  
  # Sanitizes SVG input
  gem 'loofah', '~> 2.2'
-@@ -229,13 +229,13 @@
+@@ -232,13 +232,13 @@
  gem 'licensee', '~> 8.9'
  
  # Protect against bruteforcing
@@ -245,7 +250,7 @@ gitlab Gemfile
  
  # Detect and convert string character encoding
  gem 'charlock_holmes', '~> 0.7.5'
-@@ -250,43 +250,43 @@
+@@ -253,42 +253,42 @@
  gem 'webpack-rails', '~> 0.9.10'
  gem 'rack-proxy', '~> 0.6.0'
  
@@ -293,10 +298,8 @@ gitlab Gemfile
 +gem 'peek', '~> 1.0', '>= 1.0.1'
  gem 'peek-gc', '~> 0.0.2'
 -gem 'peek-mysql2', '~> 1.1.0', group: :mysql
--gem 'peek-performance_bar', '~> 1.3.0'
 -gem 'peek-pg', '~> 1.3.0', group: :postgres
 +gem 'peek-mysql2', '~> 1.1', group: :mysql
-+gem 'peek-performance_bar', '~> 1.3'
 +gem 'peek-pg', '~> 1.3', group: :postgres
  gem 'peek-rblineprof', '~> 0.2.0'
 -gem 'peek-redis', '~> 1.2.0'
@@ -306,8 +309,12 @@ gitlab Gemfile
  
  # Metrics
  group :metrics do
-@@ -398,12 +398,12 @@
+@@ -398,15 +398,15 @@
- gem 'health_check', '~> 2.6.0'
+ gem 'oauth2', '~> 1.4'
+ 
+ # Health check
+-gem 'health_check', '~> 2.6.0'
++gem 'health_check', '~> 2.6'
  
  # System information
 -gem 'vmstat', '~> 2.3.0'
@@ -323,10 +330,10 @@ gitlab Gemfile
  
  # Required for ED25519 SSH host key support
  group :ed25519 do
-@@ -414,12 +414,12 @@
+@@ -417,12 +417,12 @@
  
  # Gitaly GRPC client
- gem 'gitaly-proto', '~> 0.96.0', require: 'gitaly'
+ gem 'gitaly-proto', '~> 0.99.0', require: 'gitaly'
 -gem 'grpc', '~> 1.11.0'
 +gem 'grpc', '~> 1.11'
  
@@ -339,7 +346,7 @@ gitlab Gemfile
  
  # Feature toggles
  gem 'flipper', '~> 0.13.0'
-@@ -431,4 +431,4 @@
+@@ -434,4 +434,4 @@
  gem 'grape_logging', '~> 1.7'
  
  # Asset synchronization

debian/patches/0100-remove-development-test.patch

@@ -2,7 +2,7 @@ Bundler will fail when it can't find these locally
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -274,7 +274,6 @@
+@@ -277,7 +277,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'
  
-@@ -299,21 +298,6 @@
+@@ -301,21 +300,6 @@
    gem 'raindrops', '~> 0.18'
  end
  

debian/patches/0110-make-test-dependencies-conditional.patch

@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -299,7 +299,7 @@
+@@ -301,7 +301,7 @@
    gem 'raindrops', '~> 0.18'
  end
  
@@ -9,7 +9,7 @@
    gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
    gem 'pry-byebug', '~> 3.4.1', platform: :mri
    gem 'pry-rails', '~> 0.3.4'
-@@ -354,9 +354,9 @@
+@@ -356,9 +356,9 @@
    gem 'simple_po_parser', '~> 1.1.2', require: false
  
    gem 'timecop', '~> 0.8.0'

debian/patches/0220-relax-webmock.patch

@@ -1,11 +1,11 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -360,7 +360,7 @@
+@@ -362,7 +362,7 @@
    gem 'shoulda-matchers', '~> 3.1.2', require: false
    gem 'email_spec', '~> 1.6.0'
    gem 'json-schema', '~> 2.8.0'
 -  gem 'webmock', '~> 2.3.2'
 +  gem 'webmock', '>= 2.3.2'
+   gem 'rails-controller-testing' if rails5? # Rails5 only gem.
    gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0.
    gem 'sham_rack', '~> 1.3.6'
-   gem 'concurrent-ruby', '~> 1.0.5'

debian/patches/0290-skip-peek-mysql2.patch

@@ -1,10 +1,10 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -281,7 +281,6 @@
+@@ -284,7 +284,6 @@
  # Perf bar
  gem 'peek', '~> 1.0', '>= 1.0.1'
  gem 'peek-gc', '~> 0.0.2'
 -gem 'peek-mysql2', '~> 1.1', group: :mysql
- gem 'peek-performance_bar', '~> 1.3'
  gem 'peek-pg', '~> 1.3', group: :postgres
  gem 'peek-rblineprof', '~> 0.2.0'
+ gem 'peek-redis', '~> 1.2'

debian/patches/0300-relax-rbnacl.patch

@@ -1,11 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -392,7 +392,7 @@
- # Required for ED25519 SSH host key support
- group :ed25519 do
-   gem 'rbnacl-libsodium'
--  gem 'rbnacl', '~> 4.0'
-+  gem 'rbnacl', '~> 5.0'
-   gem 'bcrypt_pbkdf', '~> 1.0'
- end
- 

debian/patches/0390-relax-gitaly-proto.patch

@@ -1,11 +1,11 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -397,7 +397,7 @@
+@@ -400,7 +400,7 @@
  end
  
  # Gitaly GRPC client
--gem 'gitaly-proto', '~> 0.96.0', require: 'gitaly'
+-gem 'gitaly-proto', '~> 0.99.0', require: 'gitaly'
-+gem 'gitaly-proto', '~> 0.96', require: 'gitaly'
++gem 'gitaly-proto', '~> 0.99', require: 'gitaly'
  gem 'grpc', '~> 1.11'
  
  # Locked until https://github.com/google/protobuf/issues/4210 is closed

debian/patches/0395-relax-grape-entity.patch

@@ -1,11 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -91,7 +91,7 @@
- 
- # API
- gem 'grape', '~> 1.0'
--gem 'grape-entity', '~> 0.6.0'
-+gem 'grape-entity', '~> 0.7.1'
- gem 'rack-cors', '~> 1.0', require: 'rack/cors'
- 
- # Disable strong_params so that Mash does not respond to :permitted?

debian/patches/0420-relax-net-ssh.patch

@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -386,13 +386,12 @@
+@@ -389,13 +389,12 @@
  gem 'sys-filesystem', '~> 1.1', '>= 1.1.6'
  
  # SSH host key support
@@ -11,7 +11,7 @@
  # Required for ED25519 SSH host key support
  group :ed25519 do
 -  gem 'rbnacl-libsodium'
--  gem 'rbnacl', '~> 5.0'
+-  gem 'rbnacl', '~> 4.0'
 +  gem 'ed25519', '~> 1.2'
    gem 'bcrypt_pbkdf', '~> 1.0'
  end

debian/patches/0500-set-webpack-root.patch

@@ -1,8 +1,8 @@
 --- a/config/webpack.config.js
 +++ b/config/webpack.config.js
-@@ -10,7 +10,7 @@
+@@ -7,7 +7,7 @@
+ const CompressionPlugin = require('compression-webpack-plugin');
  const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
- const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
  
 -const ROOT_PATH = path.resolve(__dirname, '..');
 +const ROOT_PATH = '/usr/share/gitlab';

debian/patches/0510-remove-dev-dependencies.patch

@@ -1,12 +1,17 @@
 --- a/package.json
 +++ b/package.json
-@@ -95,31 +95,5 @@
+@@ -96,36 +96,5 @@
-     "worker-loader": "^1.1.0"
+     "worker-loader": "^1.1.1"
    },
    "devDependencies": {
 -    "axios-mock-adapter": "^1.10.0",
 -    "babel-eslint": "^8.0.2",
--    "babel-plugin-istanbul": "^4.1.5",
+-    "babel-plugin-istanbul": "^4.1.6",
+-    "babel-plugin-rewire": "^1.1.0",
+-    "babel-template": "^6.26.0",
+-    "babel-types": "^6.26.0",
+-    "chalk": "^2.4.1",
+-    "commander": "^2.15.1",
 -    "eslint": "^3.18.0",
 -    "eslint-config-airbnb-base": "^10.0.1",
 -    "eslint-import-resolver-webpack": "^0.8.3",
@@ -20,15 +25,15 @@
 -    "istanbul": "^0.4.5",
 -    "jasmine-core": "^2.9.0",
 -    "jasmine-jquery": "^2.1.1",
--    "karma": "^2.0.0",
+-    "karma": "^2.0.2",
 -    "karma-chrome-launcher": "^2.2.0",
--    "karma-coverage-istanbul-reporter": "^1.4.1",
+-    "karma-coverage-istanbul-reporter": "^1.4.2",
 -    "karma-jasmine": "^1.1.1",
 -    "karma-mocha-reporter": "^2.2.5",
 -    "karma-sourcemap-loader": "^0.3.7",
--    "karma-webpack": "2.0.7",
+-    "karma-webpack": "3.0.0",
--    "nodemon": "^1.15.1",
+-    "nodemon": "^1.17.3",
 -    "prettier": "1.11.1",
--    "webpack-dev-server": "^2.11.2"
+-    "webpack-dev-server": "^3.1.4"
    }
  }

debian/patches/0520-add-system-lib-path-for-webpack.patch

@@ -1,6 +1,6 @@
 --- a/config/webpack.config.js
 +++ b/config/webpack.config.js
-@@ -237,6 +237,7 @@
+@@ -232,6 +232,7 @@
  
    resolve: {
      extensions: ['.js'],
@@ -8,7 +8,7 @@
      alias: {
        '~': path.join(ROOT_PATH, 'app/assets/javascripts'),
        emojis: path.join(ROOT_PATH, 'fixtures/emojis'),
-@@ -249,6 +250,10 @@
+@@ -244,6 +245,10 @@
      },
    },
  

debian/patches/0530-remove-bundle-analyzer.patch

@@ -1,14 +1,14 @@
 --- a/config/webpack.config.js
 +++ b/config/webpack.config.js
-@@ -7,7 +7,6 @@
+@@ -5,7 +5,6 @@
+ const StatsWriterPlugin = require('webpack-stats-plugin').StatsWriterPlugin;
  const CopyWebpackPlugin = require('copy-webpack-plugin');
  const CompressionPlugin = require('compression-webpack-plugin');
- const NameAllModulesPlugin = require('name-all-modules-plugin');
 -const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
- const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
  
  const ROOT_PATH = '/usr/share/gitlab';
-@@ -322,16 +321,4 @@
+ const IS_PRODUCTION = process.env.NODE_ENV === 'production';
+@@ -304,16 +303,4 @@
    }
  }
  

debian/patches/895871-markdown.patch

@@ -1,20 +0,0 @@
-Last-Update: 2018-04-17
-Forwarded: https://gitlab.com/gitlab-org/gitlab-ce/issues/45436
-Bug-Upstream: https://gitlab.com/gitlab-org/gitlab-ce/issues/45436
-Bug-Debian: https://bugs.debian.org/895871
-Author: Dmitry Smirnov <onlyjob@debian.org>
-Description: fix markdown rendering.
-
---- a/lib/banzai/renderer/redcarpet/html.rb
-+++ b/lib/banzai/renderer/redcarpet/html.rb
-@@ -5,9 +5,9 @@
-         def block_code(code, lang)
-           lang_attr = lang ? %Q{ lang="#{lang}"} : ''
- 
-           "\n<pre>" \
--            "<code#{lang_attr}>#{html_escape(code)}</code>" \
-+            "<code#{lang_attr}>#{ERB::Util.html_escape(code)}</code>" \
-           "</pre>"
-         end
-       end
-     end

debian/patches/series

@@ -1,27 +1,24 @@
-895871-markdown.patch
-html-sanitizer-2.8.patch
 0050-relax-stable-libs.patch
 0100-remove-development-test.patch
 0108-make-mysql-optional.patch
 0110-make-test-dependencies-conditional.patch
-source-init-functions.patch
-pid-log-paths.patch
 0220-relax-webmock.patch
 0280-relax-pg.patch
 0290-skip-peek-mysql2.patch
-0300-relax-rbnacl.patch
 0340-relax-httparty.patch
 0360-relax-rdoc.patch
 0390-relax-gitaly-proto.patch
-0395-relax-grape-entity.patch
 0396-relax-asciidoctor-plantuml.patch
-0410-set-webpack-root.patch
+0400-Relax-recaptcha-version.patch
-0415-remove-dev-dependencies.patch
+0410-relax-dropzonejs-rails.patch
-add-system-lib-path-for-webpack.patch
+0420-relax-net-ssh.patch
-remove-bundle-analyzer.patch
+0500-set-webpack-root.patch
-fix-mail-room-path.patch
+0510-remove-dev-dependencies.patch
-relax-ruby-version.pacth
+0520-add-system-lib-path-for-webpack.patch
-fix-8-to-10-migration.patch
+0530-remove-bundle-analyzer.patch
-0025-Relax-recaptcha-version.patch
+0600-html-sanitizer-2.8.patch
-0500-relax-dropzonejs-rails.patch
+0610-source-init-functions.patch
-0510-relax-net-ssh.patch
+0620-pid-log-paths.patch
+0630-fix-mail-room-path.patch
+0640-relax-ruby-version.patch
+0650-fix-8-to-10-migration.patch