Refresh patches

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

@@ -73,7 +73,7 @@ gitlab Gemfile
 +gem 'validates_hostname', '~> 1.0', '>= 1.0.6'
  
  # Browser detection
- gem 'browser', '~> 2.2'
+ gem 'browser', '~> 2.5'
 @@ -86,15 +86,15 @@
  gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
  
@@ -101,20 +101,20 @@ gitlab Gemfile
 +gem 'hamlit', '~> 2.8', '>= 2.8.8'
  
  # Files attachments
- gem 'carrierwave', '~> 1.2'
+ # Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332/files is merged.
-@@ -114,9 +114,9 @@
+@@ -116,9 +116,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.7.1'
-+gem 'fog-google', '~> 1.3', '>= 1.3.3'
++gem 'fog-google', '~> 1.7', '>= 1.7.1'
  gem 'fog-local', '~> 0.3'
  gem 'fog-openstack', '~> 0.1'
  gem 'fog-rackspace', '~> 0.1.1'
-@@ -129,35 +129,35 @@
+@@ -131,35 +131,35 @@
  gem 'unf', '~> 0.1.4'
  
  # Seed data
@@ -160,7 +160,7 @@ gitlab Gemfile
    gem 'unicorn-worker-killer', '~> 0.4.4'
  end
  
-@@ -170,7 +170,7 @@
+@@ -172,7 +172,7 @@
  # Background jobs
  gem 'sidekiq', '~> 5.1'
  gem 'sidekiq-cron', '~> 0.6.0'
@@ -169,7 +169,7 @@ gitlab Gemfile
  gem 'sidekiq-limit_fetch', '~> 3.4', require: false
  
  # Cron Parser
-@@ -186,39 +186,39 @@
+@@ -188,14 +188,14 @@
  gem 'ruby-progressbar'
  
  # GitLab settings
@@ -185,7 +185,9 @@ gitlab Gemfile
 -gem 'version_sorter', '~> 2.1.0'
 +gem 'version_sorter', '~> 2.1'
  
- # User agent parsing
+ # Export Ruby Regex to Javascript
+ gem 'js_regex', '~> 2.2.1'
+@@ -204,23 +204,23 @@
  gem 'device_detector'
  
  # Cache
@@ -207,16 +209,13 @@ gitlab Gemfile
 -gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
 +gem 'gitlab-flowdock-git-hook', '~> 1.0', '>= 1.0.1'
  
- # Gemnasium integration
- gem 'gemnasium-gitlab-service', '~> 0.2'
- 
  # Slack integration
 -gem 'slack-notifier', '~> 1.5.1'
 +gem 'slack-notifier', '~> 1.5', '>= 1.5.1'
  
  # Hangouts Chat integration
  gem 'hangouts-chat', '~> 0.0.5'
-@@ -230,11 +230,11 @@
+@@ -232,11 +232,11 @@
  gem 'ruby-fogbugz', '~> 0.2.1'
  
  # Kubernetes integration
@@ -230,7 +229,7 @@ gitlab Gemfile
  
  # Sanitizes SVG input
  gem 'loofah', '~> 2.2'
-@@ -243,13 +243,13 @@
+@@ -245,13 +245,13 @@
  gem 'licensee', '~> 8.9'
  
  # Protect against bruteforcing
@@ -247,7 +246,7 @@ gitlab Gemfile
  
  # Detect and convert string character encoding
  gem 'charlock_holmes', '~> 0.7.5'
-@@ -264,41 +264,41 @@
+@@ -266,41 +266,41 @@
  gem 'webpack-rails', '~> 0.9.10'
  gem 'rack-proxy', '~> 0.6.0'
  
@@ -303,7 +302,7 @@ gitlab Gemfile
  
  # Metrics
  group :metrics do
-@@ -406,15 +406,15 @@
+@@ -408,15 +408,15 @@
  gem 'oauth2', '~> 1.4'
  
  # Health check
@@ -323,11 +322,13 @@ gitlab Gemfile
  
  # Required for ED25519 SSH host key support
  group :ed25519 do
-@@ -424,12 +424,12 @@
+@@ -425,13 +425,13 @@
+ end
  
  # Gitaly GRPC client
- gem 'gitaly-proto', '~> 0.113.0', require: 'gitaly'
+-gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly'
 -gem 'grpc', '~> 1.11.0'
++gem 'gitaly-proto', '~> 0.117', require: 'gitaly'
 +gem 'grpc', '~> 1.11'
  
  # Locked until https://github.com/google/protobuf/issues/4210 is closed

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
-@@ -287,7 +287,6 @@
+@@ -289,7 +289,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'
  
-@@ -310,21 +309,6 @@
+@@ -312,21 +311,6 @@
    gem 'raindrops', '~> 0.18'
  end
  

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

@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -310,7 +310,7 @@
+@@ -312,7 +312,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
-@@ -363,9 +363,9 @@
+@@ -364,9 +364,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
-@@ -369,7 +369,7 @@
+@@ -370,7 +370,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
-@@ -294,7 +294,6 @@
+@@ -296,7 +296,6 @@
  # Perf bar
  gem 'peek', '~> 1.0', '>= 1.0.1'
  gem 'peek-gc', '~> 0.0.2'

debian/patches/0340-relax-httparty.patch

@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -178,7 +178,7 @@
+@@ -180,7 +180,7 @@
  gem 'rufus-scheduler', '~> 3.4'
  
  # HTTP requests
@@ -8,4 +8,4 @@
 +gem 'httparty', '~> 0.13'
  
  # Colored output to console
- gem 'rainbow', '~> 2.2'
+ gem 'rainbow', '~> 3.0'

debian/patches/0410-relax-dropzonejs-rails.patch

@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -112,7 +112,7 @@
+@@ -114,7 +114,7 @@
  gem 'mini_magick'
  
  # Drag and Drop UI

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

@@ -1,6 +1,6 @@
 --- a/package.json
 +++ b/package.json
-@@ -109,37 +109,5 @@
+@@ -109,39 +109,5 @@
      "xterm": "^3.5.0"
    },
    "devDependencies": {
@@ -21,6 +21,8 @@
 -    "eslint-plugin-jasmine": "^2.1.0",
 -    "eslint-plugin-promise": "^3.8.0",
 -    "eslint-plugin-vue": "^4.5.0",
+-    "gettext-extractor": "^3.3.2",
+-    "gettext-extractor-vue": "^4.0.1",
 -    "ignore": "^3.3.7",
 -    "istanbul": "^0.4.5",
 -    "jasmine-core": "^2.9.0",