refresh patches

debian/patches/0005-use-debian-omniauth-ldap.patch

@@ -3,12 +3,12 @@ Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/13280
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -60,7 +60,7 @@
+@@ -64,7 +64,7 @@
  # LDAP Auth
  # GitLab fork with several improvements to original library. For full list of changes
  # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
--gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: 'omniauth-ldap'
+-gem 'gitlab_omniauth-ldap', '~> 2.0.3', require: 'omniauth-ldap'
-+gem 'omniauth-ldap', '~> 1.0.4', require: "omniauth-ldap"
++gem 'omniauth-ldap', '~> 1.0.4', require: 'omniauth-ldap'
+ gem 'net-ldap'
  
  # Git Wiki
- # Required manually in config/initializers/gollum.rb to control load order

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

@@ -3,12 +3,13 @@ gitlab Gemfile
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -1,15 +1,15 @@
+@@ -1,59 +1,59 @@
  source 'https://rubygems.org'
  
 -gem 'rails', '4.2.8'
-+gem 'rails', '~> 4.2.8'
+-gem 'rails-deprecated_sanitizer', '~> 1.0.3'
- gem 'rails-deprecated_sanitizer', '~> 1.0.3'
++gem 'rails', '~> 4.2', '>= 4.2.8'
++gem 'rails-deprecated_sanitizer', '~> 1.0', '>= 1.0.3'
  
  # Responders respond_to and respond_with
  gem 'responders', '~> 2.0'
@@ -21,8 +22,14 @@ gitlab Gemfile
 +gem 'default_value_for', '~> 3.0'
  
  # Supported DBs
- gem 'mysql2', '~> 0.3.16', group: :mysql
+ gem 'mysql2', '~> 0.4.5', group: :mysql
-@@ -21,38 +21,38 @@
+ gem 'pg', '~> 0.18.2', group: :postgres
+ 
+ gem 'rugged', '~> 0.26.0'
+-gem 'grape-route-helpers', '~> 2.0.0'
++gem 'grape-route-helpers', '~> 2.0'
+ 
+ gem 'faraday', '~> 0.12'
  
  # Authentication libraries
  gem 'devise', '~> 4.2'
@@ -35,11 +42,11 @@ gitlab Gemfile
 +gem 'omniauth', '~> 1.4', '>= 1.4.2'
 +gem 'omniauth-auth0', '~> 1.4', '>= 1.4.1'
  gem 'omniauth-azure-oauth2', '~> 0.0.6'
--gem 'omniauth-cas3', '~> 1.1.2'
+-gem 'omniauth-cas3', '~> 1.1.4'
 -gem 'omniauth-facebook', '~> 4.0.0'
 -gem 'omniauth-github', '~> 1.1.1'
 -gem 'omniauth-gitlab', '~> 1.0.2'
-+gem 'omniauth-cas3', '~> 1.1', '>= 1.1.2'
++gem 'omniauth-cas3', '~> 1.1', '>= 1.1.4'
 +gem 'omniauth-facebook', '~> 4.0'
 +gem 'omniauth-github', '~> 1.1', '>= 1.1.1'
 +gem 'omniauth-gitlab', '~> 1.0', '>= 1.0.2'
@@ -54,7 +61,7 @@ gitlab Gemfile
 +gem 'omniauth-shibboleth', '~> 1.2'
 +gem 'omniauth-twitter', '~> 1.2'
 +gem 'omniauth_crowd', '~> 2.2'
- gem 'omniauth-authentiq', '~> 0.3.0'
+ gem 'omniauth-authentiq', '~> 0.3.1'
 -gem 'rack-oauth2', '~> 1.2.1'
 -gem 'jwt', '~> 1.5.6'
 +gem 'rack-oauth2', '~> 1.2', '>= 1.2.1'
@@ -78,16 +85,16 @@ gitlab Gemfile
  
  # Browser detection
  gem 'browser', '~> 2.2'
-@@ -60,7 +60,7 @@
+@@ -64,7 +64,7 @@
  # LDAP Auth
  # GitLab fork with several improvements to original library. For full list of changes
  # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
--gem 'omniauth-ldap', '~> 1.0.4', require: "omniauth-ldap"
+-gem 'omniauth-ldap', '~> 1.0.4', require: 'omniauth-ldap'
-+gem 'omniauth-ldap', '~> 1.0', '>= 1.0.4', require: "omniauth-ldap"
++gem 'omniauth-ldap', '~> 1.0', '>= 1.0.4', require: 'omniauth-ldap'
+ gem 'net-ldap'
  
  # Git Wiki
- # Required manually in config/initializers/gollum.rb to control load order
+@@ -73,7 +73,7 @@
-@@ -68,7 +68,7 @@
  gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
  
  # Language detection
@@ -95,26 +102,26 @@ gitlab Gemfile
 +gem 'github-linguist', '~> 4.7', require: 'linguist'
  
  # API
- gem 'grape', '~> 0.19.0'
+ gem 'grape', '~> 0.19.2'
-@@ -82,7 +82,7 @@
+@@ -87,7 +87,7 @@
- gem 'kaminari', '~> 0.17.0'
+ gem 'kaminari', '~> 1.0'
  
  # HAML
 -gem 'hamlit', '~> 2.6.1'
 +gem 'hamlit', '~> 2.6', '>= 2.6.1'
  
  # Files attachments
- gem 'carrierwave', '~> 1.0'
+ gem 'carrierwave', '~> 1.1'
-@@ -108,37 +108,37 @@
+@@ -114,35 +114,35 @@
  gem 'seed-fu', '~> 2.3.5'
  
  # Markdown and HTML processing
 -gem 'html-pipeline', '~> 1.11.0'
--gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie'
+-gem 'deckar01-task_list', '2.0.0'
 -gem 'gitlab-markup', '~> 1.5.1'
 +gem 'html-pipeline', '~> 1.11'
-+gem 'deckar01-task_list', '~> 1.0', '>= 1.0.6', require: 'task_list/railtie'
++gem 'deckar01-task_list', '2.0'
-+gem 'gitlab-markup', '~> 1.5','>= 1.5.1'
++gem 'gitlab-markup', '~> 1.5', '>= 1.5.1'
  gem 'redcarpet', '~> 3.4'
 -gem 'RedCloth', '~> 4.3.2'
 +gem 'RedCloth', '~> 4.3', '>= 4.3.2'
@@ -123,15 +130,14 @@ gitlab Gemfile
  gem 'creole', '~> 0.5.0'
  gem 'wikicloth', '0.8.1'
 -gem 'asciidoctor', '~> 1.5.2'
-+gem 'asciidoctor', '~> 1.5','>= 1.5.2'
++gem 'asciidoctor', '~> 1.5', '>= 1.5.2'
  gem 'asciidoctor-plantuml', '0.0.7'
  gem 'rouge', '~> 2.0'
- gem 'truncato', '~> 0.7.8'
+ gem 'truncato', '~> 0.7.9'
- 
+-gem 'bootstrap_form', '~> 2.7.0'
- # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
+-gem 'nokogiri', '~> 1.8.0'
- # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
++gem 'bootstrap_form', '~> 2.7'
--gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
++gem 'nokogiri', '~> 1.8'
-+gem 'nokogiri', '~> 1.6', '>= 1.6.7.2'
  
  # Diffs
 -gem 'diffy', '~> 3.1.0'
@@ -152,32 +158,25 @@ gitlab Gemfile
  
  # Issue tags
  gem 'acts-as-taggable-on', '~> 4.0'
-@@ -146,49 +146,49 @@
+@@ -150,7 +150,7 @@
  # Background jobs
  gem 'sidekiq', '~> 5.0'
- gem 'sidekiq-cron', '~> 0.4.4'
+ gem 'sidekiq-cron', '~> 0.6.0'
 -gem 'redis-namespace', '~> 1.5.2'
 +gem 'redis-namespace', '~> 1.5', '>= 1.5.2'
- gem 'sidekiq-limit_fetch', '~> 3.4'
+ gem 'sidekiq-limit_fetch', '~> 3.4', require: false
  
  # Cron Parser
--gem 'rufus-scheduler', '~> 3.1.10'
+@@ -163,36 +163,36 @@
-+gem 'rufus-scheduler', '~> 3.1', '>= 3.1.10'
+ gem 'rainbow', '~> 2.2'
- 
- # HTTP requests
- gem 'httparty', '~> 0.13.3'
- 
- # Colored output to console
--gem 'rainbow', '~> 2.1.0'
-+gem 'rainbow', '~> 2.1'
  
  # GitLab settings
 -gem 'settingslogic', '~> 2.0.9'
 +gem 'settingslogic', '~> 2.0', '>= 2.0.9'
  
  # Linear-time regex library for untrusted regular expressions
--gem 're2', '~> 1.0.0'
+-gem 're2', '~> 1.1.1'
-+gem 're2', '~> 1.0'
++gem 're2', '~> 1.1', '>= 1.1.1'
  
  # Misc
  
@@ -213,7 +212,7 @@ gitlab Gemfile
  
  # Asana integration
  gem 'asana', '~> 0.6.0'
-@@ -197,38 +197,38 @@
+@@ -201,38 +201,38 @@
  gem 'ruby-fogbugz', '~> 0.2.1'
  
  # Kubernetes integration
@@ -262,15 +261,13 @@ gitlab Gemfile
  
  # Parse time & duration
  gem 'chronic', '~> 0.10.2'
-@@ -237,32 +237,32 @@
+@@ -241,43 +241,43 @@
  gem 'webpack-rails', '~> 0.9.10'
  gem 'rack-proxy', '~> 0.6.0'
  
 -gem 'sass-rails', '~> 5.0.6'
--gem 'coffee-rails', '~> 4.1.0'
 -gem 'uglifier', '~> 2.7.2'
 +gem 'sass-rails', '~> 5.0', '>= 5.0.6'
-+gem 'coffee-rails', '~> 4.1'
 +gem 'uglifier', '~> 2.7', '>= 2.7.2'
  
 -gem 'addressable', '~> 2.3.8'
@@ -278,7 +275,7 @@ gitlab Gemfile
 +gem 'addressable', '~> 2.3', '>= 2.3.8'
 +gem 'bootstrap-sass', '~> 3.3'
  gem 'font-awesome-rails', '~> 4.7'
- gem 'gemojione', '~> 3.0'
+ gem 'gemojione', '~> 3.3'
 -gem 'gon', '~> 6.1.0'
 -gem 'jquery-atwho-rails', '~> 1.3.2'
 -gem 'jquery-rails', '~> 4.1.0'
@@ -288,46 +285,49 @@ gitlab Gemfile
  gem 'request_store', '~> 1.3'
 -gem 'select2-rails', '~> 3.5.9'
 -gem 'virtus', '~> 1.0.1'
--gem 'net-ssh', '~> 3.0.1'
 +gem 'select2-rails', '~> 3.5', '>= 3.5.9'
 +gem 'virtus', '~> 1.0', '>= 1.0.1'
-+gem 'net-ssh', '~> 3.0', '>= 3.0.1'
  gem 'base32', '~> 0.3.0'
  
  # Sentry integration
--gem 'sentry-raven', '~> 2.4.0'
+-gem 'sentry-raven', '~> 2.5.3'
-+gem 'sentry-raven', '~> 2.4'
++gem 'sentry-raven', '~> 2.5', '>= 2.5.3'
  
--gem 'premailer-rails', '~> 1.9.0'
+-gem 'premailer-rails', '~> 1.9.7'
-+gem 'premailer-rails', '~> 1.9'
++gem 'premailer-rails', '~> 1.9', '>= 1.9.7'
  
  # I18n
--gem 'ruby_parser', '~> 3.8.4', require: false
+ gem 'ruby_parser', '~> 3.8', require: false
+-gem 'rails-i18n', '~> 4.0.9'
 -gem 'gettext_i18n_rails', '~> 1.8.0'
 -gem 'gettext_i18n_rails_js', '~> 1.2.0'
-+gem 'ruby_parser', '~> 3.8', '>= 3.8.4', require: false
++gem 'rails-i18n', '~> 4.0', '>= 4.0.9'
 +gem 'gettext_i18n_rails', '~> 1.8'
 +gem 'gettext_i18n_rails_js', '~> 1.2'
  gem 'gettext', '~> 3.2.2', require: false, group: :development
  
- # Metrics
+ # Perf bar
-@@ -337,17 +337,17 @@
+-gem 'peek', '~> 1.0.1'
- end
++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
+ gem 'peek-rblineprof', '~> 0.2.0'
+-gem 'peek-redis', '~> 1.2.0'
+-gem 'peek-sidekiq', '~> 1.0.3'
++gem 'peek-redis', '~> 1.2'
++gem 'peek-sidekiq', '~> 1.0', '>= 1.0.3'
  
- group :test do
+ # Metrics
--  gem 'shoulda-matchers', '~> 2.8.0', require: false
+ group :metrics do
--  gem 'email_spec', '~> 1.6.0'
+@@ -365,7 +365,7 @@
--  gem 'json-schema', '~> 2.6.2'
+   gem 'concurrent-ruby', '~> 1.0.5'
-+  gem 'shoulda-matchers', '~> 2.8', require: false
-+  gem 'email_spec', '~> 1.6'
-+  gem 'json-schema', '~> 2.6', '>= 2.6.2'
-   gem 'webmock', '~> 1.24.0'
-   gem 'test_after_commit', '~> 1.1'
--  gem 'sham_rack', '~> 1.3.6'
-+  gem 'sham_rack', '~> 1.3', '>= 1.3.6'
-   gem 'timecop', '~> 0.8.0'
--  gem 'concurrent-ruby', '~> 1.0.5'
-+  gem 'concurrent-ruby', '~> 1.0','>= 1.0.5'
  end
  
 -gem 'octokit', '~> 4.6.2'
@@ -335,15 +335,12 @@ gitlab Gemfile
  
  gem 'mail_room', '~> 0.9.1'
  
-@@ -357,17 +357,17 @@
+@@ -378,17 +378,17 @@
- gem 'ruby-prof', '~> 0.16.2'
+ gem 'oauth2', '~> 1.4'
- 
- # OAuth
--gem 'oauth2', '~> 1.3.0'
-+gem 'oauth2', '~> 1.3'
  
  # Soft deletion
- gem 'paranoia', '~> 2.2'
+-gem 'paranoia', '~> 2.3.1'
++gem 'paranoia', '~> 2.3', '>= 2.3.1'
  
  # Health check
 -gem 'health_check', '~> 2.6.0'
@@ -355,5 +352,9 @@ gitlab Gemfile
 +gem 'vmstat', '~> 2.3'
 +gem 'sys-filesystem', '~> 1.1', '>= 1.1.6'
  
- # Gitaly GRPC client
+ # SSH host key support
- gem 'gitaly', '~> 0.6.0'
+-gem 'net-ssh', '~> 4.1.0'
++gem 'net-ssh', '~> 4.1'
+ 
+ # Required for ED25519 SSH host key support
+ group :ed25519 do

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

@@ -2,8 +2,16 @@ Bundler will fail when it can't find these locally
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -272,70 +272,6 @@
+@@ -266,7 +266,6 @@
-   gem 'influxdb', '~> 0.2', require: false
+ gem 'rails-i18n', '~> 4.0', '>= 4.0.9'
+ gem 'gettext_i18n_rails', '~> 1.8'
+ gem 'gettext_i18n_rails_js', '~> 1.2'
+-gem 'gettext', '~> 3.2.2', require: false, group: :development
+ 
+ # Perf bar
+ gem 'peek', '~> 1.0', '>= 1.0.1'
+@@ -290,21 +289,6 @@
+   gem 'raindrops', '~> 0.18'
  end
  
 -group :development do
@@ -21,55 +29,6 @@ Bundler will fail when it can't find these locally
 -  gem 'thin', '~> 1.7.0'
 -end
 -
--group :development, :test do
+ group :development, :test do
--  gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
+   gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
--  gem 'pry-byebug', '~> 3.4.1', platform: :mri
+   gem 'pry-byebug', '~> 3.4.1', platform: :mri
--  gem 'pry-rails', '~> 0.3.4'
--
--  gem 'awesome_print', '~> 1.2.0', require: false
--  gem 'fuubar', '~> 2.0.0'
--
--  gem 'database_cleaner', '~> 1.5.0'
--  gem 'factory_girl_rails', '~> 4.7.0'
--  gem 'rspec-rails', '~> 3.5.0'
--  gem 'rspec-retry', '~> 0.4.5'
--  gem 'spinach-rails', '~> 0.2.1'
--  gem 'spinach-rerun-reporter', '~> 0.0.2'
--  gem 'rspec_profiling', '~> 0.0.5'
--  gem 'rspec-set', '~> 0.1.3'
--
--  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
--  gem 'minitest', '~> 5.7.0'
--
--  # Generate Fake data
--  gem 'ffaker', '~> 2.4'
--
--  gem 'capybara', '~> 2.6.2'
--  gem 'capybara-screenshot', '~> 1.0.0'
--  gem 'poltergeist', '~> 1.9.0'
--
--  gem 'spring', '~> 2.0.0'
--  gem 'spring-commands-rspec', '~> 1.0.4'
--  gem 'spring-commands-spinach', '~> 1.1.0'
--
--  gem 'rubocop', '~> 0.47.1', require: false
--  gem 'rubocop-rspec', '~> 1.15.0', require: false
--  gem 'scss_lint', '~> 0.47.0', require: false
--  gem 'haml_lint', '~> 0.21.0', require: false
--  gem 'simplecov', '~> 0.14.0', require: false
--  gem 'flay', '~> 2.8.0', require: false
--  gem 'bundler-audit', '~> 0.5.0', require: false
--
--  gem 'benchmark-ips', '~> 2.3.0', require: false
--
--  gem 'license_finder', '~> 2.1.0', require: false
--  gem 'knapsack', '~> 1.11.0'
--
--  gem 'activerecord_sane_schema_dumper', '0.2'
--
--  gem 'stackprof', '~> 0.2.10'
--end
--
- group :test do
-   gem 'shoulda-matchers', '~> 2.8', require: false
-   gem 'email_spec', '~> 1.6'

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

@@ -13,11 +13,11 @@ Subject: [PATCH] allow specifying DB choice via ENV variable
  gem 'default_value_for', '~> 3.0'
  
  # Supported DBs
--gem 'mysql2', '~> 0.3.16', group: :mysql
+-gem 'mysql2', '~> 0.4.5', group: :mysql
 -gem 'pg', '~> 0.18.2', group: :postgres
 +ENV["DB"] ||= "mysql"
-+gem "mysql2", '~> 0.3.16' if ENV["DB"] == "all" || ENV["DB"] == "mysql"
++gem "mysql2", '~> 0.4.5' if ENV["DB"] == "all" || ENV["DB"] == "mysql"
 +gem "pg", '~> 0.18.2' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
  
- gem 'rugged', '~> 0.25.1.1'
+ gem 'rugged', '~> 0.26.0'
- 
+ gem 'grape-route-helpers', '~> 2.0'

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

@@ -1,12 +1,22 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -273,7 +273,8 @@
+@@ -290,7 +290,7 @@
-   gem 'influxdb', '~> 0.2', require: false
+   gem 'raindrops', '~> 0.18'
  end
  
--group :test do
+-group :development, :test do
-+#group :test do
 +if ENV["INCLUDE_TEST_DEPENDS"] == "true"
-   gem 'shoulda-matchers', '~> 2.8', require: false
+   gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
-   gem 'email_spec', '~> 1.6'
+   gem 'pry-byebug', '~> 3.4.1', platform: :mri
-   gem 'json-schema', '~> 2.6', '>= 2.6.2'
+   gem 'pry-rails', '~> 0.3.4'
+@@ -337,9 +337,8 @@
+   gem 'activerecord_sane_schema_dumper', '0.2'
+ 
+   gem 'stackprof', '~> 0.2.10'
+-end
+ 
+-group :test do
++# group test  
+   gem 'shoulda-matchers', '~> 3.1.2', require: false
+   gem 'email_spec', '~> 1.6.0'
+   gem 'json-schema', '~> 2.6.2'

debian/patches/0200-remove-order-dependency-in-label-finder-spec.patch

@@ -1,68 +0,0 @@
-From dfc0fc224f6d05a4680940e7a8802819a68a3043 Mon Sep 17 00:00:00 2001
-From: Nick Thomas <nick@gitlab.com>
-Date: Mon, 28 Nov 2016 12:21:55 +0000
-Subject: [PATCH] Remove an order dependency in LabelFinder specs
-
----
- spec/finders/labels_finder_spec.rb | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/spec/finders/labels_finder_spec.rb b/spec/finders/labels_finder_spec.rb
-index 9085cc8..6fd2483 100644
---- a/spec/finders/labels_finder_spec.rb
-+++ b/spec/finders/labels_finder_spec.rb
-@@ -36,7 +36,7 @@ describe LabelsFinder do
- 
-         finder = described_class.new(user)
- 
--        expect(finder.execute).to eq [group_label_2, group_label_3, project_label_1, group_label_1, project_label_2, project_label_4]
-+        expect(finder.execute).to contain_exactly(group_label_2, group_label_3, project_label_1, group_label_1, project_label_2, project_label_4)
-       end
- 
-       it 'returns labels available if nil title is supplied' do
-@@ -44,7 +44,7 @@ describe LabelsFinder do
-         # params[:title] will return `nil` regardless whether it is specified
-         finder = described_class.new(user, title: nil)
- 
--        expect(finder.execute).to eq [group_label_2, group_label_3, project_label_1, group_label_1, project_label_2, project_label_4]
-+        expect(finder.execute).to contain_exactly(group_label_2, group_label_3, project_label_1, group_label_1, project_label_2, project_label_4)
-       end
-     end
- 
-@@ -54,7 +54,7 @@ describe LabelsFinder do
- 
-         finder = described_class.new(user, group_id: group_1.id)
- 
--        expect(finder.execute).to eq [group_label_2, project_label_1, group_label_1, project_label_5]
-+        expect(finder.execute).to contain_exactly(group_label_2, project_label_1, group_label_1, project_label_5)
-       end
-     end
- 
-@@ -62,7 +62,7 @@ describe LabelsFinder do
-       it 'returns labels available for the project' do
-         finder = described_class.new(user, project_id: project_1.id)
- 
--        expect(finder.execute).to eq [group_label_2, project_label_1, group_label_1]
-+        expect(finder.execute).to contain_exactly(group_label_2, project_label_1, group_label_1)
-       end
- 
-       context 'as an administrator' do
-@@ -85,13 +85,13 @@ describe LabelsFinder do
-       it 'returns label with that title' do
-         finder = described_class.new(user, title: 'Group Label 2')
- 
--        expect(finder.execute).to eq [group_label_2]
-+        expect(finder.execute).to contain_exactly(group_label_2)
-       end
- 
-       it 'returns label with title alias' do
-         finder = described_class.new(user, name: 'Group Label 2')
- 
--        expect(finder.execute).to eq [group_label_2]
-+        expect(finder.execute).to contain_exactly(group_label_2)
-       end
- 
-       it 'returns no labels if empty title is supplied' do
--- 
-2.7.4
-

debian/patches/0220-relax-dependencies.patch

@@ -1,20 +1,11 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -252,7 +252,7 @@
+@@ -342,7 +342,7 @@
- gem 'request_store', '~> 1.3'
+   gem 'shoulda-matchers', '~> 3.1.2', require: false
- gem 'select2-rails', '~> 3.5', '>= 3.5.9'
+   gem 'email_spec', '~> 1.6.0'
- gem 'virtus', '~> 1.0', '>= 1.0.1'
+   gem 'json-schema', '~> 2.6.2'
--gem 'net-ssh', '~> 3.0', '>= 3.0.1'
+-  gem 'webmock', '~> 2.3.2'
-+gem 'net-ssh', '~> 4.0'
++  gem 'webmock', '>= 2.3.2'
- gem 'base32', '~> 0.3.0'
- 
- # Sentry integration
-@@ -278,7 +278,7 @@
-   gem 'shoulda-matchers', '~> 2.8', require: false
-   gem 'email_spec', '~> 1.6'
-   gem 'json-schema', '~> 2.6', '>= 2.6.2'
--  gem 'webmock', '~> 1.24.0'
-+  gem 'webmock', '>= 1.24.0'
    gem 'test_after_commit', '~> 1.1'
-   gem 'sham_rack', '~> 1.3', '>= 1.3.6'
+   gem 'sham_rack', '~> 1.3.6'
    gem 'timecop', '~> 0.8.0'

debian/patches/0230-relax-rugged.patch

@@ -1,20 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -16,7 +16,7 @@
- gem "mysql2", '~> 0.3.16' if ENV["DB"] == "all" || ENV["DB"] == "mysql"
- gem "pg", '~> 0.18.2' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
- 
--gem 'rugged', '~> 0.25.1.1'
-+gem 'rugged', '~> 0.24.0'
- 
- gem 'faraday', '~> 0.11.0'
- 
-@@ -66,7 +66,7 @@
- # Git Wiki
- # Required manually in config/initializers/gollum.rb to control load order
- gem 'gollum-lib', '~> 4.2', require: false
--gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
-+gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
- 
- # Language detection
- gem 'github-linguist', '~> 4.7', require: 'linguist'

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

@@ -1,7 +1,7 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -100,7 +100,7 @@
+@@ -106,7 +106,7 @@
- gem 'fog-rackspace', '~> 0.1.1'
+ gem 'fog-aliyun', '~> 0.1.0'
  
  # for Google storage
 -gem 'google-api-client', '~> 0.8.6'

debian/patches/0250-relax-licensee.patch

@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -214,7 +214,7 @@
+@@ -218,7 +218,7 @@
  gem 'loofah', '~> 2.0', '>= 2.0.3'
  
  # Working with license

debian/patches/0260-relax-ruby-parser.patch

@@ -1,11 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -261,7 +261,7 @@
- gem 'premailer-rails', '~> 1.9'
- 
- # I18n
--gem 'ruby_parser', '~> 3.8', '>= 3.8.4', require: false
-+gem 'ruby_parser', '~> 3.8', '>= 3.8.2', require: false
- gem 'gettext_i18n_rails', '~> 1.8'
- gem 'gettext_i18n_rails_js', '~> 1.2'
- gem 'gettext', '~> 3.2.2', require: false, group: :development

debian/patches/0270-relax-toml-rb.patch

@@ -1,8 +1,11 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -310,4 +310,4 @@
+@@ -384,7 +384,7 @@
  # Gitaly GRPC client
- gem 'gitaly', '~> 0.6.0'
+ gem 'gitaly', '~> 0.26.0'
  
 -gem 'toml-rb', '~> 0.3.15', require: false
 +gem 'toml-rb', '>= 0.3.15', require: false
+ 
+ # Feature toggles
+ gem 'flipper', '~> 0.10.2'

debian/patches/0280-relax-pg.patch

@@ -3,9 +3,9 @@
 @@ -14,7 +14,7 @@
  # Supported DBs
  ENV["DB"] ||= "mysql"
- gem "mysql2", '~> 0.3.16' if ENV["DB"] == "all" || ENV["DB"] == "mysql"
+ gem "mysql2", '~> 0.4.5' if ENV["DB"] == "all" || ENV["DB"] == "mysql"
 -gem "pg", '~> 0.18.2' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
 +gem "pg", '~> 0.18' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
  
- gem 'rugged', '~> 0.24.0'
+ gem 'rugged', '~> 0.26.0'
- 
+ gem 'grape-route-helpers', '~> 2.0'

debian/patches/0400-use-npm-webpack.patch

@@ -1,13 +0,0 @@
---- a/package.json
-+++ b/package.json
-@@ -8,8 +8,8 @@
-     "karma": "karma start config/karma.config.js --single-run",
-     "karma-coverage": "BABEL_ENV=coverage karma start config/karma.config.js --single-run",
-     "karma-start": "karma start config/karma.config.js",
--    "webpack": "webpack --config config/webpack.config.js",
--    "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js"
-+    "webpack": "NODE_PATH=/usr/share/gitlab/node_modules node_modules/.bin/webpack --config config/webpack.config.js",
-+    "webpack-prod": "NODE_ENV=production NODE_PATH=/usr/share/gitlab/node_modules node_modules/.bin/webpack --config config/webpack.config.js"
-   },
-   "dependencies": {
-     "babel-core": "^6.22.1",

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

@@ -1,11 +1,11 @@
 --- a/config/webpack.config.js
 +++ b/config/webpack.config.js
-@@ -8,7 +8,7 @@
+@@ -10,7 +10,7 @@
  var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
  var WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
  
 -var ROOT_PATH = path.resolve(__dirname, '..');
 +var ROOT_PATH = '/usr/share/gitlab';
  var IS_PRODUCTION = process.env.NODE_ENV === 'production';
- var IS_DEV_SERVER = process.argv[1].indexOf('webpack-dev-server') !== -1;
+ var IS_DEV_SERVER = process.argv.join(' ').indexOf('webpack-dev-server') !== -1;
  var DEV_SERVER_HOST = process.env.DEV_SERVER_HOST || 'localhost';

debian/patches/0420-use-system-libs.patch

@@ -1,25 +1,29 @@
 --- a/package.json
 +++ b/package.json
-@@ -12,52 +12,41 @@
+@@ -13,7 +13,6 @@
-     "webpack-prod": "NODE_ENV=production NODE_PATH=/usr/share/gitlab/node_modules node_modules/.bin/webpack --config config/webpack.config.js"
    },
    "dependencies": {
+     "axios": "^0.16.2",
 -    "babel-core": "^6.22.1",
-     "babel-loader": "^6.2.10",
+     "babel-eslint": "^7.2.1",
+     "babel-loader": "^7.1.1",
      "babel-plugin-transform-define": "^1.2.0",
-     "babel-preset-latest": "^6.24.0",
+@@ -22,7 +21,6 @@
-     "babel-preset-stage-2": "^6.22.0",
      "bootstrap-sass": "^3.3.6",
      "compression-webpack-plugin": "^0.3.2",
+     "copy-webpack-plugin": "^4.0.1",
 -    "core-js": "^2.4.1",
+     "cropper": "^2.3.0",
      "css-loader": "^0.28.0",
      "d3": "^3.5.11",
+@@ -30,17 +28,12 @@
      "document-register-element": "^1.3.0",
      "dropzone": "^4.2.0",
      "emoji-unicode-version": "^0.2.1",
 -    "eslint-plugin-html": "^2.0.1",
 -    "exports-loader": "^0.6.4",
 -    "file-loader": "^0.11.1",
+     "imports-loader": "^0.7.1",
 -    "jed": "^1.1.1",
      "jquery": "^2.2.1",
      "jquery-ujs": "^1.2.1",
@@ -27,9 +31,10 @@
      "jszip": "^3.1.3",
      "jszip-utils": "^0.0.2",
 -    "marked": "^0.3.6",
+     "monaco-editor": "0.8.3",
      "mousetrap": "^1.4.6",
-     "pdfjs-dist": "^1.8.252",
+     "name-all-modules-plugin": "^1.0.1",
-     "pikaday": "^1.5.1",
+@@ -48,7 +41,6 @@
      "prismjs": "^1.6.0",
      "raphael": "^2.2.7",
      "raven-js": "^3.14.0",
@@ -37,8 +42,7 @@
      "react-dev-utils": "^0.5.2",
      "select2": "3.5.2-browserify",
      "sql.js": "^0.4.0",
--    "stats-webpack-plugin": "^0.4.3",
+@@ -56,14 +48,12 @@
-     "three": "^0.84.0",
      "three-orbit-controls": "^82.1.0",
      "three-stl-loader": "^1.0.4",
      "timeago.js": "^2.0.5",
@@ -47,9 +51,9 @@
      "visibilityjs": "^1.2.4",
      "vue": "^2.2.6",
      "vue-loader": "^11.3.4",
-     "vue-resource": "^0.9.3",
+     "vue-resource": "^1.3.4",
      "vue-template-compiler": "^2.2.6",
--    "webpack": "^2.3.3",
+-    "webpack": "^3.4.0",
-     "webpack-bundle-analyzer": "^2.3.0"
+     "webpack-bundle-analyzer": "^2.8.2",
+     "webpack-stats-plugin": "^0.1.5"
    },
-   "devDependencies": {

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

@@ -1,6 +1,6 @@
 --- a/config/webpack.config.js
 +++ b/config/webpack.config.js
-@@ -186,6 +186,7 @@
+@@ -245,6 +245,7 @@
  
    resolve: {
      extensions: ['.js'],

debian/patches/series

@@ -5,15 +5,11 @@
 0110-make-test-dependencies-conditional.patch
 source-init-functions.patch
 pid-log-paths.patch
-0200-remove-order-dependency-in-label-finder-spec.patch
 0220-relax-dependencies.patch
-0230-relax-rugged.patch
 0240-relax-google-api-client.patch
 0250-relax-licensee.patch
-0260-relax-ruby-parser.patch
 0270-relax-toml-rb.patch
 0280-relax-pg.patch
-0400-use-npm-webpack.patch
 0410-set-webpack-root.patch
 0420-use-system-libs.patch
 add-system-lib-path-for-webpack.patch