Refresh patches

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

@@ -97,8 +97,8 @@ gitlab Gemfile
  gem 'kaminari', '~> 1.0'
  
  # HAML
--gem 'hamlit', '~> 2.6.1'
-+gem 'hamlit', '~> 2.6', '>= 2.6.1'
+-gem 'hamlit', '~> 2.8.8'
++gem 'hamlit', '~> 2.8', '>= 2.8.8'
  
  # Files attachments
  gem 'carrierwave', '~> 1.2'
@@ -214,9 +214,9 @@ gitlab Gemfile
 -gem 'slack-notifier', '~> 1.5.1'
 +gem 'slack-notifier', '~> 1.5', '>= 1.5.1'
  
- # Asana integration
- gem 'asana', '~> 0.6.0'
-@@ -227,11 +227,11 @@
+ # Hangouts Chat integration
+ gem 'hangouts-chat', '~> 0.0.5'
+@@ -230,11 +230,11 @@
  gem 'ruby-fogbugz', '~> 0.2.1'
  
  # Kubernetes integration
@@ -224,13 +224,13 @@ gitlab Gemfile
 +gem 'kubeclient', '~> 3.1'
  
  # Sanitize user input
- gem 'sanitize', '~> 4.6.5'
+ gem 'sanitize', '~> 4.6'
 -gem 'babosa', '~> 1.0.2'
 +gem 'babosa', '~> 1.0', '>= 1.0.2'
  
  # Sanitizes SVG input
  gem 'loofah', '~> 2.2'
-@@ -240,13 +240,13 @@
+@@ -243,13 +243,13 @@
  gem 'licensee', '~> 8.9'
  
  # Protect against bruteforcing
@@ -247,7 +247,7 @@ gitlab Gemfile
  
  # Detect and convert string character encoding
  gem 'charlock_holmes', '~> 0.7.5'
-@@ -261,41 +261,41 @@
+@@ -264,41 +264,41 @@
  gem 'webpack-rails', '~> 0.9.10'
  gem 'rack-proxy', '~> 0.6.0'
  
@@ -303,7 +303,7 @@ gitlab Gemfile
  
  # Metrics
  group :metrics do
-@@ -401,15 +401,15 @@
+@@ -406,15 +406,15 @@
  gem 'oauth2', '~> 1.4'
  
  # Health check
@@ -323,10 +323,10 @@ gitlab Gemfile
  
  # Required for ED25519 SSH host key support
  group :ed25519 do
-@@ -419,12 +419,12 @@
+@@ -424,12 +424,12 @@
  
  # Gitaly GRPC client
- gem 'gitaly-proto', '~> 0.105.0', require: 'gitaly'
+ gem 'gitaly-proto', '~> 0.113.0', require: 'gitaly'
 -gem 'grpc', '~> 1.11.0'
 +gem 'grpc', '~> 1.11'
  

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
-@@ -284,7 +284,6 @@
+@@ -287,7 +287,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'
  
-@@ -307,21 +306,6 @@
+@@ -310,21 +309,6 @@
    gem 'raindrops', '~> 0.18'
  end
  
@@ -30,5 +30,5 @@ Bundler will fail when it can't find these locally
 -end
 -
  group :development, :test do
+   gem 'bootsnap', '~> 1.3'
    gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
-   gem 'pry-byebug', '~> 3.4.1', platform: :mri

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

@@ -1,15 +1,15 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -307,7 +307,7 @@
+@@ -310,7 +310,7 @@
    gem 'raindrops', '~> 0.18'
  end
  
 -group :development, :test do
 +if ENV["INCLUDE_TEST_DEPENDS"] == "true"
+   gem 'bootsnap', '~> 1.3'
    gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
    gem 'pry-byebug', '~> 3.4.1', platform: :mri
-   gem 'pry-rails', '~> 0.3.4'
-@@ -359,9 +359,9 @@
+@@ -363,9 +363,9 @@
    gem 'simple_po_parser', '~> 1.1.2', require: false
  
    gem 'timecop', '~> 0.8.0'

debian/patches/0220-relax-webmock.patch

@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -365,7 +365,7 @@
+@@ -369,7 +369,7 @@
    gem 'shoulda-matchers', '~> 3.1.2', require: false
    gem 'email_spec', '~> 2.2.0'
    gem 'json-schema', '~> 2.8.0'

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

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

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

@@ -1,7 +1,7 @@
 --- a/package.json
 +++ b/package.json
-@@ -103,36 +103,5 @@
-     "worker-loader": "^2.0.0"
+@@ -109,37 +109,5 @@
+     "xterm": "^3.5.0"
    },
    "devDependencies": {
 -    "axios-mock-adapter": "^1.15.0",
@@ -24,15 +24,16 @@
 -    "ignore": "^3.3.7",
 -    "istanbul": "^0.4.5",
 -    "jasmine-core": "^2.9.0",
+-    "jasmine-diff": "^0.1.3",
 -    "jasmine-jquery": "^2.1.1",
--    "karma": "^2.0.2",
+-    "karma": "^2.0.4",
 -    "karma-chrome-launcher": "^2.2.0",
 -    "karma-coverage-istanbul-reporter": "^1.4.2",
--    "karma-jasmine": "^1.1.1",
+-    "karma-jasmine": "^1.1.2",
 -    "karma-mocha-reporter": "^2.2.5",
 -    "karma-sourcemap-loader": "^0.3.7",
--    "karma-webpack": "3.0.0",
--    "nodemon": "^1.17.3",
+-    "karma-webpack": "^4.0.0-beta.0",
+-    "nodemon": "^1.18.2",
 -    "prettier": "1.12.1",
 -    "webpack-dev-server": "^3.1.4"
    }