Refresh patches

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

@@ -3,10 +3,10 @@ gitlab Gemfile
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -1,59 +1,59 @@
+@@ -13,12 +13,12 @@
  source 'https://rubygems.org'
  
- gem 'rails', '4.2.10'
+ gem 'rails', gem_versions['rails']
 -gem 'rails-deprecated_sanitizer', '~> 1.0.3'
 +gem 'rails-deprecated_sanitizer', '~> 1.0', '>= 1.0.3'
  
@@ -17,28 +17,21 @@ gitlab Gemfile
 +gem 'sprockets', '~> 3.7'
  
  # Default values for AR models
--gem 'default_value_for', '~> 3.0.0'
+ gem 'default_value_for', gem_versions['default_value_for']
-+gem 'default_value_for', '~> 3.0'
+@@ -28,7 +28,7 @@
- 
- # Supported DBs
- gem 'mysql2', '~> 0.4.10', group: :mysql
  gem 'pg', '~> 0.18.2', group: :postgres
  
- gem 'rugged', '~> 0.26.0'
+ gem 'rugged', '~> 0.27'
 -gem 'grape-route-helpers', '~> 2.1.0'
 +gem 'grape-route-helpers', '~> 2.1'
  
  gem 'faraday', '~> 0.12'
  
- # Authentication libraries
+@@ -37,35 +37,35 @@
- gem 'devise', '~> 4.2'
+ gem 'doorkeeper', '~> 4.3'
--gem 'doorkeeper', '~> 4.2.0'
+ gem 'doorkeeper-openid_connect', '~> 1.3'
--gem 'doorkeeper-openid_connect', '~> 1.2.0'
+ gem 'omniauth', '~> 1.8'
--gem 'omniauth', '~> 1.4.2'
 -gem 'omniauth-auth0', '~> 2.0.0'
-+gem 'doorkeeper', '~> 4.2'
-+gem 'doorkeeper-openid_connect', '~> 1.2'
-+gem 'omniauth', '~> 1.4', '>= 1.4.2'
 +gem 'omniauth-auth0', '~> 2.0'
  gem 'omniauth-azure-oauth2', '~> 0.0.9'
 -gem 'omniauth-cas3', '~> 1.1.4'
@@ -49,16 +42,14 @@ gitlab Gemfile
 +gem 'omniauth-facebook', '~> 4.0'
 +gem 'omniauth-github', '~> 1.1', '>= 1.1.1'
 +gem 'omniauth-gitlab', '~> 1.0', '>= 1.0.2'
- gem 'omniauth-google-oauth2', '~> 0.5.2'
+ gem 'omniauth-google-oauth2', '~> 0.5.3'
  gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
  gem 'omniauth-oauth2-generic', '~> 0.2.2'
--gem 'omniauth-saml', '~> 1.7.0'
+ gem 'omniauth-saml', '~> 1.10'
 -gem 'omniauth-shibboleth', '~> 1.2.0'
--gem 'omniauth-twitter', '~> 1.2.0'
--gem 'omniauth_crowd', '~> 2.2.0'
-+gem 'omniauth-saml', '~> 1.7'
 +gem 'omniauth-shibboleth', '~> 1.2'
-+gem 'omniauth-twitter', '~> 1.2'
+ gem 'omniauth-twitter', '~> 1.4'
+-gem 'omniauth_crowd', '~> 2.2.0'
 +gem 'omniauth_crowd', '~> 2.2'
  gem 'omniauth-authentiq', '~> 0.3.1'
 -gem 'rack-oauth2', '~> 1.2.1'
@@ -74,8 +65,8 @@ gitlab Gemfile
 -gem 'devise-two-factor', '~> 3.0.0'
 +gem 'devise-two-factor', '~> 3.0'
  gem 'rqrcode-rails3', '~> 0.1.7'
--gem 'attr_encrypted', '~> 3.0.0'
+-gem 'attr_encrypted', '~> 3.1.0'
-+gem 'attr_encrypted', '~> 3.0'
++gem 'attr_encrypted', '~> 3.1'
  gem 'u2f', '~> 0.2.1'
  
  # GitLab Pages
@@ -84,7 +75,7 @@ gitlab Gemfile
  
  # Browser detection
  gem 'browser', '~> 2.2'
-@@ -81,12 +81,12 @@
+@@ -93,12 +93,12 @@
  gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
  
  # Language detection
@@ -99,7 +90,7 @@ gitlab Gemfile
  
  # Disable strong_params so that Mash does not respond to :permitted?
  gem 'hashie-forbidden_attributes'
-@@ -95,7 +95,7 @@
+@@ -107,7 +107,7 @@
  gem 'kaminari', '~> 1.0'
  
  # HAML
@@ -108,7 +99,16 @@ gitlab Gemfile
  
  # Files attachments
  gem 'carrierwave', '~> 1.2'
-@@ -119,32 +119,32 @@
+@@ -116,7 +116,7 @@
+ 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-local', '~> 0.3'
+@@ -131,32 +131,32 @@
  gem 'unf', '~> 0.1.4'
  
  # Seed data
@@ -116,10 +116,10 @@ gitlab Gemfile
 +gem 'seed-fu', '~> 2.3', '>= 2.3.7'
  
  # Markdown and HTML processing
--gem 'html-pipeline', '~> 1.11.0'
+-gem 'html-pipeline', '~> 2.7.1'
 -gem 'deckar01-task_list', '2.0.0'
 -gem 'gitlab-markup', '~> 1.6.2'
-+gem 'html-pipeline', '~> 1.11'
++gem 'html-pipeline', '~> 2.7', '>= 2.7.1'
 +gem 'deckar01-task_list', '2.0'
 +gem 'gitlab-markup', '~> 1.6', '>= 1.6.2'
  gem 'redcarpet', '~> 3.4'
@@ -130,9 +130,9 @@ gitlab Gemfile
  gem 'org-ruby', '~> 0.9.12'
  gem 'creole', '~> 0.5.0'
  gem 'wikicloth', '0.8.1'
--gem 'asciidoctor', '~> 1.5.2'
+-gem 'asciidoctor', '~> 1.5.6'
-+gem 'asciidoctor', '~> 1.5', '>= 1.5.2'
++gem 'asciidoctor', '~> 1.5', '>= 1.5.6'
- gem 'asciidoctor-plantuml', '0.0.7'
+ gem 'asciidoctor-plantuml', '0.0.8'
  gem 'rouge', '~> 2.0'
  gem 'truncato', '~> 0.7.9'
 -gem 'bootstrap_form', '~> 2.7.0'
@@ -151,7 +151,7 @@ gitlab Gemfile
    gem 'unicorn-worker-killer', '~> 0.4.4'
  end
  
-@@ -157,7 +157,7 @@
+@@ -169,7 +169,7 @@
  # Background jobs
  gem 'sidekiq', '~> 5.0'
  gem 'sidekiq-cron', '~> 0.6.0'
@@ -160,7 +160,7 @@ gitlab Gemfile
  gem 'sidekiq-limit_fetch', '~> 3.4', require: false
  
  # Cron Parser
-@@ -170,36 +170,36 @@
+@@ -182,36 +182,36 @@
  gem 'rainbow', '~> 2.2'
  
  # GitLab settings
@@ -204,12 +204,8 @@ gitlab Gemfile
  
  # Asana integration
  gem 'asana', '~> 0.6.0'
-@@ -208,35 +208,35 @@
+@@ -223,11 +223,11 @@
- gem 'ruby-fogbugz', '~> 0.2.1'
+ gem 'kubeclient', '~> 3.0'
- 
- # Kubernetes integration
--gem 'kubeclient', '~> 2.2.0'
-+gem 'kubeclient', '~> 2.2'
  
  # d3
 -gem 'd3_rails', '~> 3.5.0'
@@ -222,10 +218,8 @@ gitlab Gemfile
  
  # Sanitizes SVG input
  gem 'loofah', '~> 2.2'
- 
+@@ -236,13 +236,13 @@
- # Working with license
+ gem 'licensee', '~> 8.9'
--gem 'licensee', '~> 8.7.0'
-+gem 'licensee', '~> 8.7'
  
  # Protect against bruteforcing
 -gem 'rack-attack', '~> 4.4.1'
@@ -241,14 +235,7 @@ gitlab Gemfile
  
  # Detect and convert string character encoding
  gem 'charlock_holmes', '~> 0.7.5'
- 
+@@ -257,43 +257,43 @@
- # Faster JSON
--gem 'oj', '~> 2.17.4'
-+gem 'oj', '~> 2.17', '>= 2.17.4'
- 
- # Faster blank
- gem 'fast_blank'
-@@ -248,45 +248,45 @@
  gem 'webpack-rails', '~> 0.9.10'
  gem 'rack-proxy', '~> 0.6.0'
  
@@ -265,10 +252,8 @@ gitlab Gemfile
  gem 'gemojione', '~> 3.3'
 -gem 'gon', '~> 6.1.0'
 -gem 'jquery-atwho-rails', '~> 1.3.2'
--gem 'jquery-rails', '~> 4.3.1'
 +gem 'gon', '~> 6.1'
 +gem 'jquery-atwho-rails', '~> 1.3', '>= 1.3.2'
-+gem 'jquery-rails', '~> 4.3', '>= 4.3.1'
  gem 'request_store', '~> 1.3'
 -gem 'select2-rails', '~> 3.5.9'
 -gem 'virtus', '~> 1.0.1'
@@ -277,22 +262,18 @@ gitlab Gemfile
  gem 'base32', '~> 0.3.0'
  
  # Sentry integration
--gem 'sentry-raven', '~> 2.5.3'
+ gem 'sentry-raven', '~> 2.7'
-+gem 'sentry-raven', '~> 2.5', '>= 2.5.3'
  
 -gem 'premailer-rails', '~> 1.9.7'
 +gem 'premailer-rails', '~> 1.9', '>= 1.9.7'
  
  # I18n
  gem 'ruby_parser', '~> 3.8', require: false
--gem 'rails-i18n', '~> 4.0.9'
+ gem 'rails-i18n', gem_versions['rails-i18n']
 -gem 'gettext_i18n_rails', '~> 1.8.0'
--gem 'gettext_i18n_rails_js', '~> 1.2.0'
--gem 'gettext', '~> 3.2.2', require: false, group: :development
-+gem 'rails-i18n', '~> 4.0', '>= 4.0.9'
 +gem 'gettext_i18n_rails', '~> 1.8'
-+gem 'gettext_i18n_rails_js', '~> 1.2'
+ gem 'gettext_i18n_rails_js', '~> 1.3'
-+gem 'gettext', '~> 3.2', '>= 3.2.2', require: false, group: :development
+ gem 'gettext', '~> 3.2.2', require: false, group: :development
  
 -gem 'batch-loader', '~> 1.2.1'
 +gem 'batch-loader', '~> 1.2', '>= 1.2.1'
@@ -301,11 +282,9 @@ gitlab Gemfile
 -gem 'peek', '~> 1.0.1'
 +gem 'peek', '~> 1.0', '>= 1.0.1'
  gem 'peek-gc', '~> 0.0.2'
--gem 'peek-host', '~> 1.0.0'
 -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-host', '~> 1.0'
 +gem 'peek-mysql2', '~> 1.1', group: :mysql
 +gem 'peek-performance_bar', '~> 1.3'
 +gem 'peek-pg', '~> 1.3', group: :postgres
@@ -317,16 +296,7 @@ gitlab Gemfile
  
  # Metrics
  group :metrics do
-@@ -381,7 +381,7 @@
+@@ -405,12 +405,12 @@
-   gem 'test-prof', '~> 0.2.5'
- end
- 
--gem 'octokit', '~> 4.6.2'
-+gem 'octokit', '~> 4.6', '>= 4.6.2'
- 
- gem 'mail_room', '~> 0.9.1'
- 
-@@ -397,12 +397,12 @@
  gem 'health_check', '~> 2.6.0'
  
  # System information
@@ -336,23 +306,30 @@ gitlab Gemfile
 +gem 'sys-filesystem', '~> 1.1', '>= 1.1.6'
  
  # SSH host key support
--gem 'net-ssh', '~> 4.1.0'
+-gem 'net-ssh', '~> 4.2.0'
 -gem 'sshkey', '~> 1.9.0'
-+gem 'net-ssh', '~> 4.1'
++gem 'net-ssh', '~> 4.2'
 +gem 'sshkey', '~> 1.9'
  
  # Required for ED25519 SSH host key support
  group :ed25519 do
-@@ -418,7 +418,7 @@
+@@ -421,12 +421,12 @@
+ 
+ # Gitaly GRPC client
+ gem 'gitaly-proto', '~> 0.96.0', require: 'gitaly'
+-gem 'grpc', '~> 1.10.0'
++gem 'grpc', '~> 1.10'
+ 
  # Locked until https://github.com/google/protobuf/issues/4210 is closed
- gem 'google-protobuf', '= 3.5.1'
+-gem 'google-protobuf', '= 3.5.1'
++gem 'google-protobuf', '~> 3.5', '>= 3.5.1'
  
 -gem 'toml-rb', '~> 1.0.0', require: false
 +gem 'toml-rb', '~> 1.0', require: false
  
  # Feature toggles
- gem 'flipper', '~> 0.11.0'
+ gem 'flipper', '~> 0.13.0'
-@@ -430,4 +430,4 @@
+@@ -438,4 +438,4 @@
  gem 'grape_logging', '~> 1.7'
  
  # Asset synchronization

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

@@ -2,21 +2,21 @@ Bundler will fail when it can't find these locally
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -273,7 +273,6 @@
+@@ -281,7 +281,6 @@
- gem 'rails-i18n', '~> 4.0', '>= 4.0.9'
+ gem 'rails-i18n', gem_versions['rails-i18n']
  gem 'gettext_i18n_rails', '~> 1.8'
- gem 'gettext_i18n_rails_js', '~> 1.2'
+ gem 'gettext_i18n_rails_js', '~> 1.3'
--gem 'gettext', '~> 3.2', '>= 3.2.2', require: false, group: :development
+-gem 'gettext', '~> 3.2.2', require: false, group: :development
  
  gem 'batch-loader', '~> 1.2', '>= 1.2.1'
  
-@@ -299,21 +298,6 @@
+@@ -306,21 +305,6 @@
    gem 'raindrops', '~> 0.18'
  end
  
 -group :development do
--  gem 'foreman', '~> 0.78.0'
+-  gem 'foreman', '~> 0.84.0'
--  gem 'brakeman', '~> 3.6.0', require: false
+-  gem 'brakeman', '~> 4.2', require: false
 -
 -  gem 'letter_opener_web', '~> 1.3.0'
 -  gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false

debian/patches/0108-make-mysql-optional.patch

@@ -9,8 +9,8 @@ Subject: [PATCH] allow specifying DB choice via ENV variable
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -12,8 +12,9 @@
+@@ -24,8 +24,9 @@
- gem 'default_value_for', '~> 3.0'
+ gem 'default_value_for', gem_versions['default_value_for']
  
  # Supported DBs
 -gem 'mysql2', '~> 0.4.10', group: :mysql
@@ -19,5 +19,5 @@ Subject: [PATCH] allow specifying DB choice via ENV variable
 +gem 'mysql2', '~> 0.4.10' if ENV["DB"] == "all" || ENV["DB"] == "mysql"
 +gem 'pg', '~> 0.18.2' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
  
- gem 'rugged', '~> 0.26.0'
+ gem 'rugged', '~> 0.27'
  gem 'grape-route-helpers', '~> 2.1'

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

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

debian/patches/0220-relax-webmock.patch

@@ -1,11 +1,11 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -358,7 +358,7 @@
+@@ -367,7 +367,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 'test_after_commit', '~> 1.1'
+   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 'timecop', '~> 0.8.0'
+   gem 'concurrent-ruby', '~> 1.0.5'

debian/patches/0280-relax-pg.patch

@@ -1,11 +1,11 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -14,7 +14,7 @@
+@@ -26,7 +26,7 @@
  # Supported DBs
  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"
 +gem 'pg', '~> 0.19' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
  
- gem 'rugged', '~> 0.26.0'
+ gem 'rugged', '~> 0.27'
  gem 'grape-route-helpers', '~> 2.1'

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

@@ -1,11 +1,10 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -281,7 +281,7 @@
+@@ -288,7 +288,6 @@
+ # Perf bar
  gem 'peek', '~> 1.0', '>= 1.0.1'
  gem 'peek-gc', '~> 0.0.2'
- gem 'peek-host', '~> 1.0'
 -gem 'peek-mysql2', '~> 1.1', group: :mysql
-+#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'

debian/patches/0300-relax-rbnacl.patch

@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -392,7 +392,7 @@
+@@ -399,7 +399,7 @@
  # Required for ED25519 SSH host key support
  group :ed25519 do
    gem 'rbnacl-libsodium'

debian/patches/0320-relax-fog-aws.patch

@@ -1,11 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -105,7 +105,7 @@
- gem 'dropzonejs-rails', '~> 0.7.1'
- 
- # for backups
--gem 'fog-aws', '~> 1.4'
-+gem 'fog-aws', '>= 1.4'
- gem 'fog-core', '~> 1.44'
- gem 'fog-google', '~> 0.5'
- gem 'fog-local', '~> 0.3'

debian/patches/0330-relax-acts-as-taggable-on.patch

@@ -1,11 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -153,7 +153,7 @@
- gem 'state_machines-activerecord', '~> 0.4.0'
- 
- # Issue tags
--gem 'acts-as-taggable-on', '~> 4.0'
-+gem 'acts-as-taggable-on', '~> 5.0'
- 
- # Background jobs
- gem 'sidekiq', '~> 5.0'

debian/patches/0340-relax-httparty.patch

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

debian/patches/0350-relax-oj.patch

@@ -1,11 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -237,7 +237,7 @@
- gem 'charlock_holmes', '~> 0.7.5'
- 
- # Faster JSON
--gem 'oj', '~> 2.17', '>= 2.17.4'
-+gem 'oj', '>= 2.17.4'
- 
- # Faster blank
- gem 'fast_blank'

debian/patches/0360-relax-rdoc.patch

@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -129,7 +129,7 @@
+@@ -141,7 +141,7 @@
  gem 'redcarpet', '~> 3.4'
  gem 'commonmarker', '~> 0.17'
  gem 'RedCloth', '~> 4.3', '>= 4.3.2'

debian/patches/0370-relax-prof.patch

@@ -1,11 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -373,7 +373,7 @@
- gem 'email_reply_trimmer', '~> 0.1'
- gem 'html2text'
- 
--gem 'ruby-prof', '~> 0.16.2'
-+gem 'ruby-prof', '~> 0.16'
- 
- # OAuth
- gem 'oauth2', '~> 1.4'

debian/patches/0380-relax-google-api-client.patch

@@ -1,11 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -114,7 +114,7 @@
- gem 'fog-aliyun', '~> 0.2.0'
- 
- # for Google storage
--gem 'google-api-client', '~> 0.13.6'
-+gem 'google-api-client', '~> 0.13'
- 
- # for aws storage
- gem 'unf', '~> 0.1.4'

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

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

debian/patches/0391-relax-google-protobuf.patch

@@ -1,11 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -401,7 +401,7 @@
- gem 'grpc', '~> 1.10.0'
- 
- # Locked until https://github.com/google/protobuf/issues/4210 is closed
--gem 'google-protobuf', '= 3.5.1'
-+gem 'google-protobuf', '~> 3.2'
- 
- gem 'toml-rb', '~> 1.0', require: false
- 

debian/patches/0392-relax-flipper.patch

@@ -1,15 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -406,9 +406,9 @@
- gem 'toml-rb', '~> 1.0', require: false
- 
- # Feature toggles
--gem 'flipper', '~> 0.11.0'
--gem 'flipper-active_record', '~> 0.11.0'
--gem 'flipper-active_support_cache_store', '~> 0.11.0'
-+gem 'flipper', '~> 0.11'
-+gem 'flipper-active_record', '~> 0.11'
-+gem 'flipper-active_support_cache_store', '~> 0.11'
- 
- # Structured logging
- gem 'lograge', '~> 0.5'

debian/patches/0393-relax-kubeclient.patch

@@ -1,11 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -209,7 +209,7 @@
- gem 'ruby-fogbugz', '~> 0.2.1'
- 
- # Kubernetes integration
--gem 'kubeclient', '~> 2.2'
-+gem 'kubeclient', '~> 3.0'
- 
- # d3
- gem 'd3_rails', '~> 3.5'

debian/patches/0394-relax-grpc.patch

@@ -1,11 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -398,7 +398,7 @@
- 
- # Gitaly GRPC client
- gem 'gitaly-proto', '~> 0.88', require: 'gitaly'
--gem 'grpc', '~> 1.10.0'
-+gem 'grpc', '~> 1.3'
- 
- # Locked until https://github.com/google/protobuf/issues/4210 is closed
- gem 'google-protobuf', '~> 3.2'

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

@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -86,7 +86,7 @@
+@@ -98,7 +98,7 @@
  
  # API
  gem 'grape', '~> 1.0'

debian/patches/0396-relax-asciidoctor-plantuml.patch

@@ -2,12 +2,12 @@ https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18643
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -134,7 +134,7 @@
+@@ -146,7 +146,7 @@
  gem 'creole', '~> 0.5.0'
  gem 'wikicloth', '0.8.1'
- gem 'asciidoctor', '~> 1.5', '>= 1.5.2'
+ gem 'asciidoctor', '~> 1.5', '>= 1.5.6'
--gem 'asciidoctor-plantuml', '0.0.7'
+-gem 'asciidoctor-plantuml', '0.0.8'
-+gem 'asciidoctor-plantuml', '~> 0.0.7'
++gem 'asciidoctor-plantuml', '~> 0.0.8'
  gem 'rouge', '~> 2.0'
  gem 'truncato', '~> 0.7.9'
  gem 'bootstrap_form', '~> 2.7'

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

@@ -1,6 +1,6 @@
 --- a/config/webpack.config.js
 +++ b/config/webpack.config.js
-@@ -12,7 +12,7 @@
+@@ -10,7 +10,7 @@
  const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
  const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
  

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

@@ -1,10 +1,9 @@
 --- a/package.json
 +++ b/package.json
-@@ -91,31 +91,5 @@
+@@ -95,31 +95,5 @@
      "worker-loader": "^1.1.0"
    },
    "devDependencies": {
--    "@gitlab-org/gitlab-svgs": "^1.8.0",
 -    "axios-mock-adapter": "^1.10.0",
 -    "babel-eslint": "^8.0.2",
 -    "babel-plugin-istanbul": "^4.1.5",
@@ -17,6 +16,7 @@
 -    "eslint-plugin-jasmine": "^2.1.0",
 -    "eslint-plugin-promise": "^3.5.0",
 -    "eslint-plugin-vue": "^4.0.1",
+-    "ignore": "^3.3.7",
 -    "istanbul": "^0.4.5",
 -    "jasmine-core": "^2.9.0",
 -    "jasmine-jquery": "^2.1.1",
@@ -28,7 +28,7 @@
 -    "karma-sourcemap-loader": "^0.3.7",
 -    "karma-webpack": "2.0.7",
 -    "nodemon": "^1.15.1",
--    "prettier": "1.9.2",
+-    "prettier": "1.11.1",
 -    "webpack-dev-server": "^2.11.2"
    }
  }

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

@@ -1,15 +1,15 @@
 --- a/config/webpack.config.js
 +++ b/config/webpack.config.js
-@@ -234,6 +234,7 @@
+@@ -237,6 +237,7 @@
  
    resolve: {
      extensions: ['.js'],
 +    modules: ['/usr/share/gitlab/node_modules', '/usr/lib/nodejs'],
      alias: {
        '~': path.join(ROOT_PATH, 'app/assets/javascripts'),
-       'emojis':         path.join(ROOT_PATH, 'fixtures/emojis'),
+       emojis: path.join(ROOT_PATH, 'fixtures/emojis'),
-@@ -246,6 +247,10 @@
+@@ -249,6 +250,10 @@
-     }
+     },
    },
  
 +  resolveLoader: {

debian/patches/remove-bundle-analyzer.patch

@@ -1,6 +1,6 @@
 --- a/config/webpack.config.js
 +++ b/config/webpack.config.js
-@@ -9,7 +9,6 @@
+@@ -7,7 +7,6 @@
  const CopyWebpackPlugin = require('copy-webpack-plugin');
  const CompressionPlugin = require('compression-webpack-plugin');
  const NameAllModulesPlugin = require('name-all-modules-plugin');
@@ -8,7 +8,7 @@
  const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
  
  const ROOT_PATH = '/usr/share/gitlab';
-@@ -316,16 +315,4 @@
+@@ -322,16 +321,4 @@
    }
  }
  

debian/patches/series

@@ -9,18 +9,9 @@ pid-log-paths.patch
 0280-relax-pg.patch
 0290-skip-peek-mysql2.patch
 0300-relax-rbnacl.patch
-0320-relax-fog-aws.patch
-0330-relax-acts-as-taggable-on.patch
 0340-relax-httparty.patch
-0350-relax-oj.patch
 0360-relax-rdoc.patch
-0370-relax-prof.patch
-0380-relax-google-api-client.patch
 0390-relax-gitaly-proto.patch
-0391-relax-google-protobuf.patch
-0392-relax-flipper.patch
-0393-relax-kubeclient.patch
-0394-relax-grpc.patch
 0395-relax-grape-entity.patch
 0396-relax-asciidoctor-plantuml.patch
 0410-set-webpack-root.patch