Index: head/www/gitlab/files/patch-Gemfile
===================================================================
--- head/www/gitlab/files/patch-Gemfile	(revision 442919)
+++ head/www/gitlab/files/patch-Gemfile	(revision 442920)
@@ -1,335 +1,336 @@
 --- Gemfile.orig	2017-05-05 12:53:55 UTC
 +++ Gemfile
-@@ -1,26 +1,22 @@
+@@ -1,44 +1,39 @@
  source 'https://rubygems.org'
  
 -gem 'rails', '4.2.7.1'
 +gem 'rails', '>= 4.2.7.1'
  gem 'rails-deprecated_sanitizer', '~> 1.0.3'
  
  # Responders respond_to and respond_with
  gem 'responders', '~> 2.0'
  
 -gem 'sprockets', '~> 3.7.0'
 +gem 'sprockets', '>= 3.7.0'
  
  # Default values for AR models
 -gem 'default_value_for', '~> 3.0.0'
 -
 -# Supported DBs
 -gem 'mysql2', '~> 0.3.16', group: :mysql
 -gem 'pg', '~> 0.18.2', group: :postgres
 +gem 'default_value_for', '>= 3.0.0'
  
 -gem 'rugged', '~> 0.24.0'
 +gem 'rugged', '~> 0.24'
  
  # Authentication libraries
  gem 'devise',                 '~> 4.2'
  gem 'doorkeeper',             '~> 4.2.0'
 -gem 'omniauth',               '~> 1.3.2'
 +gem 'omniauth',               '>= 1.3.2'
  gem 'omniauth-auth0',         '~> 1.4.1'
  gem 'omniauth-azure-oauth2',  '~> 0.0.6'
  gem 'omniauth-cas3',          '~> 1.1.2'
-@@ -28,17 +24,16 @@ gem 'omniauth-facebook',      '~> 4.0.0'
+ gem 'omniauth-facebook',      '~> 4.0.0'
  gem 'omniauth-github',        '~> 1.1.1'
  gem 'omniauth-gitlab',        '~> 1.0.2'
- gem 'omniauth-google-oauth2', '~> 0.4.1'
+-gem 'omniauth-google-oauth2', '~> 0.4.1'
 -gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
++gem 'omniauth-google-oauth2', '>= 0.4.1'
  gem 'omniauth-saml',          '~> 1.7.0'
  gem 'omniauth-shibboleth',    '~> 1.2.0'
 -gem 'omniauth-twitter',       '~> 1.2.0'
 +gem 'omniauth-twitter',       '>= 1.2.0'
  gem 'omniauth_crowd',         '~> 2.2.0'
 -gem 'omniauth-authentiq',     '~> 0.2.0'
 -gem 'rack-oauth2',            '~> 1.2.1'
 +gem 'omniauth-authentiq',     '>= 0.2.0'
 +gem 'rack-oauth2',            '>= 1.2.1'
  gem 'jwt',                    '~> 1.5.6'
  
  # Spam and anti-bot protection
 -gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
 +gem 'recaptcha', '>= 3.0', require: 'recaptcha/rails'
  gem 'akismet', '~> 2.0'
  
  # Two-factor authentication
 @@ -64,10 +59,10 @@ gem 'gollum-lib', '~> 4.2', require: fal
  gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
  
  # Language detection
 -gem 'github-linguist', '~> 4.7.0', require: 'linguist'
 +gem 'github-linguist', '>= 4.7.0', require: 'linguist'
  
  # API
 -gem 'grape',        '~> 0.18.0'
 +gem 'grape',        '>= 0.18.0'
  gem 'grape-entity', '~> 0.6.0'
  gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
  
 @@ -75,10 +70,10 @@ gem 'rack-cors',    '~> 0.4.0', require:
  gem 'kaminari', '~> 0.17.0'
  
  # HAML
 -gem 'hamlit', '~> 2.6.1'
 +gem 'hamlit', '>= 2.6.1'
  
  # Files attachments
 -gem 'carrierwave', '~> 0.10.0'
 +gem 'carrierwave', '>= 0.10.0'
  
  # Drag and Drop UI
  gem 'dropzonejs-rails', '~> 0.7.1'
 @@ -92,7 +87,7 @@ gem 'fog-openstack', '~> 0.1'
  gem 'fog-rackspace', '~> 0.1.1'
  
  # for Google storage
 -gem 'google-api-client', '~> 0.8.6'
 +gem 'google-api-client', '>= 0.8.6'
  
  # for aws storage
  gem 'unf', '~> 0.1.4'
 @@ -102,29 +97,29 @@ 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 'gitlab-markup',        '~> 1.5.1'
 -gem 'redcarpet',            '~> 3.3.3'
 +gem 'deckar01-task_list',   '>= 1.0.6', require: 'task_list/railtie'
 +gem 'gitlab-markup',        '>= 1.5.1'
 +gem 'redcarpet',            '>= 3.3.3'
  gem 'RedCloth',             '~> 4.3.2'
  gem 'rdoc',                 '~> 4.2'
  gem 'org-ruby',             '~> 0.9.12'
  gem 'creole',               '~> 0.5.0'
 -gem 'wikicloth',            '0.8.1'
 +gem 'wikicloth',            '>= 0.8.1'
  gem 'asciidoctor',          '~> 1.5.2'
 -gem 'asciidoctor-plantuml', '0.0.7'
 +gem 'asciidoctor-plantuml', '>= 0.0.7'
  gem 'rouge',                '~> 2.0'
  gem 'truncato',             '~> 0.7.8'
  
  # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
  # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
 -gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
 +gem 'nokogiri', '>= 1.6.7.2'
  
  # Diffs
 -gem 'diffy', '~> 3.1.0'
 +gem 'diffy', '>= 3.1.0'
  
  # Application server
  group :unicorn do
 -  gem 'unicorn', '~> 5.1.0'
 +  gem 'unicorn', '>= 5.1.0'
    gem 'unicorn-worker-killer', '~> 0.4.4'
  end
  
 @@ -143,10 +138,10 @@ gem 'redis-namespace', '~> 1.5.2'
  gem 'sidekiq-limit_fetch', '~> 3.4'
  
  # HTTP requests
 -gem 'httparty', '~> 0.13.3'
 +gem 'httparty', '>= 0.13.3'
  
  # Colored output to console
 -gem 'rainbow', '~> 2.1.0'
 +gem 'rainbow', '>= 2.1.0'
  
  # GitLab settings
  gem 'settingslogic', '~> 2.0.9'
 @@ -166,7 +161,7 @@ gem 'connection_pool', '~> 2.0'
  gem 'hipchat', '~> 1.5.0'
  
  # JIRA integration
 -gem 'jira-ruby', '~> 1.1.2'
 +gem 'jira-ruby', '>= 1.1.2'
  
  # Flowdock integration
  gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
 @@ -178,13 +173,13 @@ gem 'gemnasium-gitlab-service', '~> 0.2'
  gem 'slack-notifier', '~> 1.5.1'
  
  # Asana integration
 -gem 'asana', '~> 0.4.0'
 +gem 'asana', '>= 0.4.0'
  
  # FogBugz integration
  gem 'ruby-fogbugz', '~> 0.2.1'
  
  # Kubernetes integration
 -gem 'kubeclient', '~> 2.2.0'
 +gem 'kubeclient', '>= 2.2.0'
  
  # d3
  gem 'd3_rails', '~> 3.5.0'
 @@ -193,17 +188,17 @@ gem 'd3_rails', '~> 3.5.0'
  gem 'underscore-rails', '~> 1.8.0'
  
  # Sanitize user input
 -gem 'sanitize', '~> 2.0'
 +gem 'sanitize', '>= 2.0'
  gem 'babosa', '~> 1.0.2'
  
  # Sanitizes SVG input
  gem 'loofah', '~> 2.0.3'
  
  # Working with license
 -gem 'licensee', '~> 8.0.0'
 +gem 'licensee', '>= 8.0.0'
  
  # Protect against bruteforcing
 -gem 'rack-attack', '~> 4.4.1'
 +gem 'rack-attack', '>= 4.4.1'
  
  # Ace editor
  gem 'ace-rails-ap', '~> 4.1.0'
 @@ -222,132 +217,53 @@ gem 'chronic', '~> 0.10.2'
  gem 'chronic_duration', '~> 0.10.6'
  
  gem 'webpack-rails', '~> 0.9.9'
 -gem 'rack-proxy', '~> 0.6.0'
 +gem 'rack-proxy', '>= 0.6.0'
  
  gem 'sass-rails', '~> 5.0.6'
  gem 'coffee-rails', '~> 4.1.0'
 -gem 'uglifier', '~> 2.7.2'
 +gem 'uglifier', '>= 2.7.2'
  
 -gem 'addressable',        '~> 2.3.8'
 +gem 'addressable',        '>= 2.3.8'
  gem 'bootstrap-sass',     '~> 3.3.0'
 -gem 'font-awesome-rails', '~> 4.6.1'
 +gem 'font-awesome-rails', '>= 4.6.1'
  gem 'gemojione',          '~> 3.0'
  gem 'gon',                '~> 6.1.0'
  gem 'jquery-atwho-rails', '~> 1.3.2'
 -gem 'jquery-rails',       '~> 4.1.0'
 +gem 'jquery-rails',       '>= 4.1.0'
  gem 'jquery-ui-rails',    '~> 5.0.0'
 -gem 'request_store',      '~> 1.3'
 +gem 'request_store',      '>= 1.3'
  gem 'select2-rails',      '~> 3.5.9'
  gem 'virtus',             '~> 1.0.1'
 -gem 'net-ssh',            '~> 3.0.1'
 +gem 'net-ssh',            '>= 3.0.1'
  gem 'base32',             '~> 0.3.0'
  
  # Sentry integration
 -gem 'sentry-raven', '~> 2.0.0'
 +gem 'sentry-raven', '>= 2.0.0'
  
  gem 'premailer-rails', '~> 1.9.0'
  
 -# Metrics
 -group :metrics do
 -  gem 'allocations', '~> 1.0', require: false, platform: :mri
 -  gem 'method_source', '~> 0.8', require: false
 -  gem 'influxdb', '~> 0.2', require: false
 -end
 -
 -group :development do
 -  gem 'foreman', '~> 0.78.0'
 -  gem 'brakeman', '~> 3.4.0', require: false
 -
 -  gem 'letter_opener_web', '~> 1.3.0'
 -  gem 'bullet', '~> 5.2.0', require: false
 -  gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
 -  gem 'web-console', '~> 2.0'
 -
 -  # Better errors handler
 -  gem 'better_errors', '~> 1.0.1'
 -  gem 'binding_of_caller', '~> 0.7.2'
 -
 -  # thin instead webrick
 -  gem 'thin', '~> 1.7.0'
 -end
 -
 -group :development, :test do
 -  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'
 -
 -  # 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',                   '~> 1.7.0'
 -  gem 'spring-commands-rspec',    '~> 1.0.4'
 -  gem 'spring-commands-spinach',  '~> 1.1.0'
 -
 -  gem 'rubocop', '~> 0.46.0', require: false
 -  gem 'rubocop-rspec', '~> 1.9.1', require: false
 -  gem 'scss_lint', '~> 0.47.0', require: false
 -  gem 'haml_lint', '~> 0.18.2', require: false
 -  gem 'simplecov', '0.12.0', require: false
 -  gem 'flay', '~> 2.6.1', 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.0', require: false
 -  gem 'email_spec', '~> 1.6.0'
 -  gem 'json-schema', '~> 2.6.2'
 -  gem 'webmock', '~> 1.21.0'
 -  gem 'test_after_commit', '~> 1.1'
 -  gem 'sham_rack', '~> 1.3.6'
 -  gem 'timecop', '~> 0.8.0'
 -end
 -
  gem 'newrelic_rpm', '~> 3.16'
  
 -gem 'octokit', '~> 4.6.2'
 +gem 'octokit', '>= 4.6.2'
  
  gem 'mail_room', '~> 0.9.0'
  
 -gem 'email_reply_trimmer', '~> 0.1'
 +gem 'email_reply_trimmer', '>= 0.1'
  gem 'html2text'
  
  gem 'ruby-prof', '~> 0.16.2'
  
  # OAuth
 -gem 'oauth2', '~> 1.2.0'
 +gem 'oauth2', '>= 1.2.0'
  
  # Soft deletion
  gem 'paranoia', '~> 2.2'
  
  # Health check
 -gem 'health_check', '~> 2.2.0'
 +gem 'health_check', '>= 2.2.0'
  
  # System information
  gem 'vmstat', '~> 2.3.0'
  gem 'sys-filesystem', '~> 1.1.6'
 +
 +gem 'rinku'