Refresh patches

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

@@ -74,12 +74,13 @@ gitlab Gemfile
  
  # Browser detection
  gem 'browser', '~> 2.5'
-@@ -84,16 +84,16 @@
+@@ -76,17 +76,17 @@
- gem 'gitlab-gollum-lib', '~> 4.2', require: false
+ # LDAP Auth
- 
+ # GitLab fork with several improvements to original library. For full list of changes
- # Language detection
+ # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
--gem 'github-linguist', '~> 5.3.3', require: 'linguist'
+-gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
-+gem 'github-linguist', '~> 5.3', '>= 5.3.3', require: 'linguist'
++gem 'gitlab_omniauth-ldap', '~> 2.0', '>= 2.0.4', require: 'omniauth-ldap'
+ gem 'net-ldap'
  
  # API
  gem 'grape', '~> 1.1'
@@ -95,7 +96,7 @@ gitlab Gemfile
  
  # Disable strong_params so that Mash does not respond to :permitted?
  gem 'hashie-forbidden_attributes'
-@@ -102,7 +102,7 @@
+@@ -95,7 +95,7 @@
  gem 'kaminari', '~> 1.0'
  
  # HAML
@@ -104,7 +105,7 @@ gitlab Gemfile
  
  # Files attachments
  # Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332/files is merged.
-@@ -111,9 +111,9 @@
+@@ -104,9 +104,9 @@
  gem 'mini_magick'
  
  # for backups
@@ -116,7 +117,7 @@ gitlab Gemfile
  gem 'fog-local', '~> 0.3'
  gem 'fog-openstack', '~> 0.1'
  gem 'fog-rackspace', '~> 0.1.1'
-@@ -126,36 +126,36 @@
+@@ -119,37 +119,37 @@
  gem 'unf', '~> 0.1.4'
  
  # Seed data
@@ -139,14 +140,16 @@ gitlab Gemfile
  gem 'creole', '~> 0.5.0'
  gem 'wikicloth', '0.8.1'
 -gem 'asciidoctor', '~> 1.5.6'
+-gem 'asciidoctor-plantuml', '0.0.8'
 +gem 'asciidoctor', '~> 1.5', '>= 1.5.6'
- gem 'asciidoctor-plantuml', '0.0.8'
++gem 'asciidoctor-plantuml', '~> 0.0.8'
  gem 'rouge', '~> 3.1'
  gem 'truncato', '~> 0.7.9'
 -gem 'bootstrap_form', '~> 2.7.0'
 -gem 'nokogiri', '~> 1.8.2'
 +gem 'bootstrap_form', '~> 2.7'
 +gem 'nokogiri', '~> 1.8', '>= 1.8.2'
+ gem 'escape_utils', '~> 1.1'
  
  # Calendar rendering
  gem 'icalendar'
@@ -162,7 +165,7 @@ gitlab Gemfile
    gem 'unicorn-worker-killer', '~> 0.4.4'
  end
  
-@@ -166,9 +166,9 @@
+@@ -165,9 +165,9 @@
  gem 'acts-as-taggable-on', '~> 5.0'
  
  # Background jobs
@@ -174,7 +177,7 @@ gitlab Gemfile
  
  # Cron Parser
  gem 'rufus-scheduler', '~> 3.4'
-@@ -183,14 +183,14 @@
+@@ -182,14 +182,14 @@
  gem 'ruby-progressbar'
  
  # GitLab settings
@@ -192,7 +195,7 @@ gitlab Gemfile
  
  # Export Ruby Regex to Javascript
  gem 'js_regex', '~> 2.2.1'
-@@ -199,23 +199,23 @@
+@@ -198,14 +198,14 @@
  gem 'device_detector'
  
  # Cache
@@ -209,10 +212,8 @@ gitlab Gemfile
  
  # JIRA integration
  gem 'jira-ruby', '~> 1.4'
- 
+@@ -214,7 +214,7 @@
- # Flowdock integration
+ gem 'flowdock', '~> 0.7'
--gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
-+gem 'gitlab-flowdock-git-hook', '~> 1.0', '>= 1.0.1'
  
  # Slack integration
 -gem 'slack-notifier', '~> 1.5.1'
@@ -220,7 +221,7 @@ gitlab Gemfile
  
  # Hangouts Chat integration
  gem 'hangouts-chat', '~> 0.0.5'
-@@ -227,11 +227,11 @@
+@@ -226,11 +226,11 @@
  gem 'ruby-fogbugz', '~> 0.2.1'
  
  # Kubernetes integration
@@ -234,7 +235,7 @@ gitlab Gemfile
  
  # Sanitizes SVG input
  gem 'loofah', '~> 2.2'
-@@ -240,13 +240,13 @@
+@@ -239,10 +239,10 @@
  gem 'licensee', '~> 8.9'
  
  # Protect against bruteforcing
@@ -245,13 +246,9 @@ gitlab Gemfile
 -gem 'ace-rails-ap', '~> 4.1.0'
 +gem 'ace-rails-ap', '~> 4.1'
  
- # Keyboard shortcuts
--gem 'mousetrap-rails', '~> 1.4.6'
-+gem 'mousetrap-rails', '~> 1.4', '>= 1.4.6'
- 
  # Detect and convert string character encoding
  gem 'charlock_holmes', '~> 0.7.5'
-@@ -261,40 +261,40 @@
+@@ -257,40 +257,40 @@
  gem 'webpack-rails', '~> 0.9.10'
  gem 'rack-proxy', '~> 0.6.0'
  
@@ -305,7 +302,7 @@ gitlab Gemfile
  gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch'
  
  # Metrics
-@@ -403,15 +403,15 @@
+@@ -399,15 +399,15 @@
  gem 'oauth2', '~> 1.4'
  
  # Health check
@@ -325,18 +322,16 @@ gitlab Gemfile
  
  # Required for ED25519 SSH host key support
  group :ed25519 do
-@@ -420,13 +420,13 @@
+@@ -416,12 +416,12 @@
  end
  
  # Gitaly GRPC client
--gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly'
+-gem 'gitaly-proto', '~> 0.123.0', require: 'gitaly'
--gem 'grpc', '~> 1.11.0'
+-gem 'grpc', '~> 1.15.0'
-+gem 'gitaly-proto', '~> 0.118', require: 'gitaly'
++gem 'gitaly-proto', '~> 0.123', require: 'gitaly'
-+gem 'grpc', '~> 1.11'
++gem 'grpc', '~> 1.15'
  
- # Locked until https://github.com/google/protobuf/issues/4210 is closed
+ gem 'google-protobuf', '~> 3.6'
--gem 'google-protobuf', '= 3.5.1'
-+gem 'google-protobuf', '>= 3.5.1'
  
 -gem 'toml-rb', '~> 1.0.0', require: false
 +gem 'toml-rb', '~> 1.0', require: false

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 @@
+@@ -280,7 +280,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 @@
+@@ -303,21 +302,6 @@
    gem 'raindrops', '~> 0.18'
  end
  

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

@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -307,7 +307,7 @@
+@@ -303,7 +303,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
-@@ -359,9 +359,9 @@
+@@ -355,9 +355,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 @@
+@@ -361,7 +361,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 @@
+@@ -287,7 +287,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
-@@ -175,7 +175,7 @@
+@@ -174,7 +174,7 @@
  gem 'rufus-scheduler', '~> 3.4'
  
  # HTTP requests

debian/patches/0420-relax-js-regex.patch

@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -194,7 +194,7 @@
+@@ -193,7 +193,7 @@
  gem 'version_sorter', '~> 2.1'
  
  # Export Ruby Regex to Javascript

debian/patches/0430-remove-gitlab-markup.patch

@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -132,7 +132,6 @@
+@@ -125,7 +125,6 @@
  # Markdown and HTML processing
  gem 'html-pipeline', '~> 2.8'
  gem 'deckar01-task_list', '2.0'

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

@@ -6,6 +6,6 @@
  
 -const ROOT_PATH = path.resolve(__dirname, '..');
 +const ROOT_PATH = '/usr/share/gitlab';
- const CACHE_PATH = path.join(ROOT_PATH, 'tmp/cache');
+ const CACHE_PATH = process.env.WEBPACK_CACHE_PATH || path.join(ROOT_PATH, 'tmp/cache');
  const IS_PRODUCTION = process.env.NODE_ENV === 'production';
  const IS_DEV_SERVER = process.argv.join(' ').indexOf('webpack-dev-server') !== -1;

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

@@ -1,11 +1,11 @@
 --- a/package.json
 +++ b/package.json
-@@ -111,40 +111,5 @@
+@@ -111,35 +111,5 @@
      "xterm": "^3.5.0"
    },
    "devDependencies": {
+-    "@gitlab/eslint-config": "^1.1.0",
 -    "axios-mock-adapter": "^1.15.0",
--    "babel-eslint": "^9.0.0",
 -    "babel-plugin-istanbul": "^5.1.0",
 -    "babel-plugin-rewire": "^1.2.0",
 -    "babel-template": "^6.26.0",
@@ -13,17 +13,12 @@
 -    "chalk": "^2.4.1",
 -    "commander": "^2.18.0",
 -    "eslint": "~5.6.0",
--    "eslint-config-airbnb-base": "^13.1.0",
 -    "eslint-import-resolver-webpack": "^0.10.1",
--    "eslint-plugin-filenames": "^1.3.2",
 -    "eslint-plugin-html": "4.0.5",
 -    "eslint-plugin-import": "^2.14.0",
 -    "eslint-plugin-jasmine": "^2.10.1",
--    "eslint-plugin-promise": "^4.0.1",
--    "eslint-plugin-vue": "^5.0.0-beta.3",
 -    "gettext-extractor": "^3.3.2",
 -    "gettext-extractor-vue": "^4.0.1",
--    "ignore": "^3.3.7",
 -    "istanbul": "^0.4.5",
 -    "jasmine-core": "^2.9.0",
 -    "jasmine-diff": "^0.1.3",
@@ -37,8 +32,8 @@
 -    "karma-sourcemap-loader": "^0.3.7",
 -    "karma-webpack": "^4.0.0-beta.0",
 -    "nodemon": "^1.18.4",
--    "prettier": "1.12.1",
+-    "prettier": "1.14.3",
 -    "webpack-dev-server": "^3.1.8"
 -  }
-+    }
++      }
  }

debian/patches/0620-pid-log-paths.patch

@@ -1,10 +1,8 @@
 Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/13415
 
-Index: gitlab/bin/background_jobs
+--- a/bin/background_jobs
-===================================================================
++++ b/bin/background_jobs
---- gitlab.orig/bin/background_jobs
+@@ -7,6 +7,11 @@
-+++ gitlab/bin/background_jobs
-@@ -7,6 +7,11 @@ sidekiq_logfile="$app_root/log/sidekiq.l
  sidekiq_config="$app_root/config/sidekiq_queues.yml"
  gitlab_user=$(ls -l config.ru | awk '{print $3}')
  
@@ -16,11 +14,9 @@ Index: gitlab/bin/background_jobs
  warn()
  {
    echo "$@" 1>&2
-Index: gitlab/bin/web
+--- a/bin/web
-===================================================================
++++ b/bin/web
---- gitlab.orig/bin/web
+@@ -12,6 +12,11 @@
-+++ gitlab/bin/web
-@@ -7,6 +7,11 @@ unicorn_pidfile="$app_root/tmp/pids/unic
  unicorn_config="$app_root/config/unicorn.rb"
  unicorn_cmd="bundle exec unicorn_rails -c $unicorn_config -E $RAILS_ENV"
  
@@ -32,11 +28,9 @@ Index: gitlab/bin/web
  get_unicorn_pid()
  {
    local pid=$(cat $unicorn_pidfile)
-Index: gitlab/bin/mail_room
+--- a/bin/mail_room
-===================================================================
++++ b/bin/mail_room
---- gitlab.orig/bin/mail_room
+@@ -7,6 +7,11 @@
-+++ gitlab/bin/mail_room
-@@ -7,6 +7,11 @@ mail_room_pidfile="$app_root/tmp/pids/ma
  mail_room_logfile="$app_root/log/mail_room.log"
  mail_room_config="$app_root/config/mail_room.yml"
  

debian/patches/0640-relax-ruby-version.patch

@@ -2,7 +2,7 @@ Debian's ruby has the latest security patches applied
 
 --- a/lib/system_check/app/ruby_version_check.rb
 +++ b/lib/system_check/app/ruby_version_check.rb
-@@ -5,7 +5,7 @@
+@@ -7,7 +7,7 @@
        set_check_pass -> { "yes (#{self.current_version})" }
  
        def self.required_version

debian/patches/0650-fix-8-to-10-migration.patch

@@ -4,7 +4,7 @@ Bug, upstream: https://gitlab.com/gitlab-org/gitlab-ce/issues/48040
 
 --- a/lib/gitlab/gitaly_client.rb
 +++ b/lib/gitlab/gitaly_client.rb
-@@ -240,6 +240,12 @@
+@@ -242,6 +242,12 @@
        # Disabled features are always off!
        return false if status == MigrationStatus::DISABLED