Update d/patches/0050-*

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

@@ -1,4 +1,4 @@
-We should be able to update minor versions of stable libs without breaking
+We should be able to update minor versions of stable libs withough breaking
 gitlab Gemfile
 
 --- a/Gemfile
@@ -6,13 +6,13 @@ gitlab Gemfile
 @@ -1,7 +1,7 @@
  source 'https://rubygems.org'
  
- gem 'rails', '5.0.7.1'
+ gem 'rails', '5.0.7.2'
 -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'
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ gem 'nakayoshi_fork', '~> 0.0.4'
  # Responders respond_to and respond_with
  gem 'responders', '~> 2.0'
  
@@ -21,7 +21,7 @@ gitlab Gemfile
  
  # Default values for AR models
  gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
-@@ -28,57 +28,57 @@
+@@ -28,57 +28,57 @@ gem 'devise', '~> 4.4'
  gem 'doorkeeper', '~> 4.3'
  gem 'doorkeeper-openid_connect', '~> 1.5'
  gem 'omniauth', '~> 1.8'
@@ -97,7 +97,7 @@ gitlab Gemfile
  
  # Disable strong_params so that Mash does not respond to :permitted?
  gem 'hashie-forbidden_attributes'
-@@ -87,16 +87,16 @@
+@@ -87,16 +87,16 @@ gem 'hashie-forbidden_attributes'
  gem 'kaminari', '~> 1.0'
  
  # HAML
@@ -117,7 +117,7 @@ gitlab Gemfile
  gem 'fog-local', '~> 0.3'
  gem 'fog-openstack', '~> 0.1'
  gem 'fog-rackspace', '~> 0.1.1'
-@@ -109,32 +109,32 @@
+@@ -109,32 +109,32 @@ gem 'google-api-client', '~> 0.23'
  gem 'unf', '~> 0.1.4'
  
  # Seed data
@@ -159,7 +159,7 @@ gitlab Gemfile
  
  # Application server
  # The 2.0.6 version of rack requires monkeypatch to be present in
-@@ -143,7 +143,7 @@
+@@ -143,7 +143,7 @@ gem 'diffy', '~> 3.1.0'
  gem 'rack', '2.0.6'
  
  group :unicorn do
@@ -168,7 +168,7 @@ gitlab Gemfile
    gem 'unicorn-worker-killer', '~> 0.4.4'
  end
  
-@@ -159,9 +159,9 @@
+@@ -159,9 +159,9 @@ gem 'state_machines-activerecord', '~> 0.5.1'
  gem 'acts-as-taggable-on', '~> 5.0'
  
  # Background jobs
@@ -180,7 +180,7 @@ gitlab Gemfile
  gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
  
  # Cron Parser
-@@ -177,14 +177,14 @@
+@@ -177,14 +177,14 @@ gem 'rainbow', '~> 3.0'
  gem 'ruby-progressbar'
  
  # GitLab settings
@@ -198,7 +198,7 @@ gitlab Gemfile
  
  # Export Ruby Regex to Javascript
  gem 'js_regex', '~> 3.1'
-@@ -193,7 +193,7 @@
+@@ -193,7 +193,7 @@ gem 'js_regex', '~> 3.1'
  gem 'device_detector'
  
  # Cache
@@ -207,7 +207,7 @@ gitlab Gemfile
  
  # Redis
  gem 'redis', '~> 3.2'
-@@ -203,7 +203,7 @@
+@@ -203,7 +203,7 @@ gem 'connection_pool', '~> 2.0'
  gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
  
  # HipChat integration
@@ -216,7 +216,7 @@ gitlab Gemfile
  
  # JIRA integration
  gem 'jira-ruby', '~> 1.4'
-@@ -212,7 +212,7 @@
+@@ -212,7 +212,7 @@ gem 'jira-ruby', '~> 1.4'
  gem 'flowdock', '~> 0.7'
  
  # Slack integration
@@ -225,7 +225,7 @@ gitlab Gemfile
  
  # Hangouts Chat integration
  gem 'hangouts-chat', '~> 0.0.5'
-@@ -224,11 +224,11 @@
+@@ -224,11 +224,11 @@ gem 'asana', '~> 0.8.1'
  gem 'ruby-fogbugz', '~> 0.2.1'
  
  # Kubernetes integration
@@ -235,11 +235,11 @@ gitlab Gemfile
  # Sanitize user input
  gem 'sanitize', '~> 4.6'
 -gem 'babosa', '~> 1.0.2'
-+gem 'babosa', '~> 1.0', '>= 1.0.2'
++gem 'babosa', '~> 1.0', '>= 1.0.2
  
  # Sanitizes SVG input
  gem 'loofah', '~> 2.2'
-@@ -237,10 +237,10 @@
+@@ -237,10 +237,10 @@ gem 'loofah', '~> 2.2'
  gem 'licensee', '~> 8.9'
  
  # Protect against bruteforcing
@@ -252,7 +252,7 @@ gitlab Gemfile
  
  # Detect and convert string character encoding
  gem 'charlock_holmes', '~> 0.7.5'
-@@ -258,41 +258,41 @@
+@@ -258,41 +258,41 @@ gem 'chronic_duration', '~> 0.10.6'
  gem 'webpack-rails', '~> 0.9.10'
  gem 'rack-proxy', '~> 0.6.0'
  
@@ -300,7 +300,7 @@ gitlab Gemfile
  gem 'peek-gc', '~> 0.0.2'
 -gem 'peek-mysql2', '~> 1.2.0', group: :mysql
 -gem 'peek-pg', '~> 1.3.0', group: :postgres
-+gem 'peek-mysql2', '~> 1.2', group: :mysql
++gem 'peek-mysql2', '~> 1.2', group: :mysq
 +gem 'peek-pg', '~> 1.3', group: :postgres
  gem 'peek-rblineprof', '~> 0.2.0'
 -gem 'peek-redis', '~> 1.2.0'
@@ -308,7 +308,7 @@ gitlab Gemfile
  
  # Metrics
  group :metrics do
-@@ -318,54 +318,54 @@
+@@ -318,54 +318,54 @@ group :development do
    gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
  
    # Better errors handler
@@ -378,7 +378,7 @@ gitlab Gemfile
  
    gem 'license_finder', '~> 5.4', require: false
    gem 'knapsack', '~> 1.17'
-@@ -374,18 +374,18 @@
+@@ -374,18 +374,18 @@ group :development, :test do
  
    gem 'stackprof', '~> 0.2.10', require: false
  
@@ -403,7 +403,7 @@ gitlab Gemfile
    gem 'concurrent-ruby', '~> 1.1'
    gem 'test-prof', '~> 0.2.5'
    gem 'rspec_junit_formatter'
-@@ -405,15 +405,15 @@
+@@ -405,15 +405,15 @@ gem 'rbtrace', '~> 0.4', require: false
  gem 'oauth2', '~> 1.4'
  
  # Health check
@@ -423,7 +423,7 @@ gitlab Gemfile
  
  # Required for ED25519 SSH host key support
  group :ed25519 do
-@@ -422,12 +422,12 @@
+@@ -422,12 +422,12 @@ group :ed25519 do
  end
  
  # Gitaly GRPC client