Index: head/www/gitlab/Makefile
===================================================================
--- head/www/gitlab/Makefile	(revision 450128)
+++ head/www/gitlab/Makefile	(revision 450129)
@@ -1,240 +1,240 @@
 # Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gitlab
 PORTVERSION=	9.3.11
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www devel
 
 MAINTAINER=	tz@FreeBSD.org
 COMMENT=	Web GUI for managing git repositories
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 OPTIONS_SINGLE=	DATABASE
 OPTIONS_SINGLE_DATABASE=	PGSQL MYSQL
 OPTIONS_DEFAULT=	PGSQL
 PGSQL_DESC=	Default PostgreSQL support (preferred)
 MYSQL_DESC=	Optional MySQL support
 
 BUILD_DEPENDS=	gem:devel/ruby-gems
 
 # the rubygems of RUN_DEPENDS matches the order of the Gemfile
 # which makes maintaining this long list much easier!
 # only rubygem-pg and rubygem-mysql are defined later as RUN_DEPENDS
 # for the options
 RUN_DEPENDS=	git>=2.14.1:devel/git \
 	gitlab-shell>=5.0.4:devel/gitlab-shell\
 	gitlab-workhorse>=2.0.0:www/gitlab-workhorse \
 	redis>=2.8.23:databases/redis \
 	npm>=4.3.0:www/npm \
 	yarn>=0.17.0:www/yarn \
 	rubygem-rails4>=4.2.8:www/rubygem-rails4 \
 	rubygem-rails-deprecated_sanitizer>=1.0.3:devel/rubygem-rails-deprecated_sanitizer \
 	rubygem-responders>=2.0:www/rubygem-responders \
 	rubygem-sprockets3>=3.7:devel/rubygem-sprockets3 \
 	rubygem-default_value_for>=3.0.1:devel/rubygem-default_value_for \
 	rubygem-rugged>=0.25.1.1:devel/rubygem-rugged \
 	rubygem-faraday>=0.11.0:www/rubygem-faraday \
 	rubygem-devise>=4.2:devel/rubygem-devise \
 	rubygem-doorkeeper>=4.2:security/rubygem-doorkeeper \
 	rubygem-doorkeeper-openid_connect>=1.1.0:security/rubygem-doorkeeper-openid_connect \
 	rubygem-omniauth>=1.4.2:security/rubygem-omniauth \
 	rubygem-omniauth-auth0>=1.4.1:net/rubygem-omniauth-auth0 \
 	rubygem-omniauth-azure-oauth2>=0.0.6:net/rubygem-omniauth-azure-oauth2 \
 	rubygem-omniauth-cas3>=1.1.4:security/rubygem-omniauth-cas3 \
 	rubygem-omniauth-facebook>=4.0.0:net/rubygem-omniauth-facebook \
 	rubygem-omniauth-github11>=1.1.1:net/rubygem-omniauth-github11 \
 	rubygem-omniauth-gitlab>=1.0.2:security/rubygem-omniauth-gitlab \
 	rubygem-omniauth-google-oauth2>=0.4.1:net/rubygem-omniauth-google-oauth2 \
 	rubygem-omniauth-oauth2-generic>=0.2.2:security/rubygem-omniauth-oauth2-generic \
 	rubygem-omniauth-saml>=1.7.0:security/rubygem-omniauth-saml \
 	rubygem-omniauth-shibboleth>=1.2.0:security/rubygem-omniauth-shibboleth \
 	rubygem-omniauth-twitter>=1.2.0:net/rubygem-omniauth-twitter \
 	rubygem-omniauth_crowd>=2.2.0:devel/rubygem-omniauth_crowd \
 	rubygem-omniauth-authentiq>=0.3.0:net/rubygem-omniauth-authentiq \
 	rubygem-rack-oauth2>=1.2.1:security/rubygem-rack-oauth2 \
 	rubygem-jwt>=1.5.6:www/rubygem-jwt \
 	rubygem-recaptcha>=3.0:devel/rubygem-recaptcha \
 	rubygem-akismet>=2.0:devel/rubygem-akismet \
 	rubygem-devise-two-factor>=3.0.0:security/rubygem-devise-two-factor \
 	rubygem-rqrcode-rails3>=0.1.7:www/rubygem-rqrcode-rails3 \
 	rubygem-attr_encrypted>=3.0.0:security/rubygem-attr_encrypted \
 	rubygem-u2f0>=0.2.1:net/rubygem-u2f0 \
 	rubygem-validates_hostname>=1.0.6:dns/rubygem-validates_hostname \
 	rubygem-browser>=2.2:www/rubygem-browser \
 	rubygem-gitlab_omniauth-ldap1>=1.2.1:net/rubygem-gitlab_omniauth-ldap1 \
 	rubygem-gollum-lib-gitlab>=4.2.0:www/rubygem-gollum-lib-gitlab \
 	rubygem-gollum-rugged_adapter>=0.4.4:www/rubygem-gollum-rugged_adapter \
 	rubygem-github-linguist>=4.7.0:textproc/rubygem-github-linguist \
 	rubygem-grape0>=0.19.0:devel/rubygem-grape0 \
 	rubygem-grape-entity>=0.6.0:devel/rubygem-grape-entity \
 	rubygem-hashie-forbidden_attributes>=0:devel/rubygem-hashie-forbidden_attributes \
 	rubygem-rack-cors0>=0.4.0:www/rubygem-rack-cors0 \
 	rubygem-kaminari-rails4>=0.17.0:www/rubygem-kaminari-rails4 \
 	rubygem-hamlit>=2.6.1:www/rubygem-hamlit \
 	rubygem-carrierwave>=1.0:www/rubygem-carrierwave \
 	rubygem-dropzonejs-rails>=0.7.1:www/rubygem-dropzonejs-rails \
 	rubygem-fog-aws0>=0.9:net/rubygem-fog-aws0 \
 	rubygem-fog-core>=1.44:devel/rubygem-fog-core \
 	rubygem-fog-google>=0.3:net/rubygem-fog-google \
 	rubygem-fog-local>=0.3:net/rubygem-fog-local \
 	rubygem-fog-openstack>=0.1:net/rubygem-fog-openstack \
 	rubygem-fog-rackspace>=0.1.1:net/rubygem-fog-rackspace \
 	rubygem-fog-aliyun>=0.1.0:net/rubygem-fog-aliyun \
 	rubygem-google-api-client010>=0.8.6:devel/rubygem-google-api-client010 \
 	rubygem-unf>=0.1.4:textproc/rubygem-unf \
 	rubygem-seed-fu>=2.3.5:databases/rubygem-seed-fu \
 	rubygem-html-pipeline1>=1.11.0:textproc/rubygem-html-pipeline1 \
 	rubygem-deckar01-task_list>=2.0.0:www/rubygem-deckar01-task_list \
 	rubygem-gitlab-markup>=1.5.1:textproc/rubygem-gitlab-markup \
 	rubygem-redcarpet>=3.4:textproc/rubygem-redcarpet \
 	rubygem-redcloth>=4.3.2:www/rubygem-redcloth \
 	rubygem-rdoc>=4.2:devel/rubygem-rdoc \
 	rubygem-org-ruby>=0.9.12:textproc/rubygem-org-ruby \
 	rubygem-creole>=0.5.0:textproc/rubygem-creole \
 	rubygem-wikicloth>=0.8.1:textproc/rubygem-wikicloth \
 	rubygem-asciidoctor>=1.5.2:textproc/rubygem-asciidoctor \
 	rubygem-asciidoctor-plantuml>=0.0.7:textproc/rubygem-asciidoctor-plantuml \
 	rubygem-rouge>=2.0:textproc/rubygem-rouge \
 	rubygem-truncato>=0.7.9:textproc/rubygem-truncato \
 	rubygem-nokogiri>=1.8.0:textproc/rubygem-nokogiri  \
 	rubygem-diffy>=3.1.0:textproc/rubygem-diffy \
 	rubygem-unicorn>=5.1.0:www/rubygem-unicorn \
 	rubygem-unicorn-worker-killer>=0.4.4:www/rubygem-unicorn-worker-killer \
 	rubygem-state_machines-activerecord>=0.4.0:databases/rubygem-state_machines-activerecord \
 	rubygem-after_commit_queue>=1.3.0:databases/rubygem-after_commit_queue \
 	rubygem-acts-as-taggable-on>=4.0.0:www/rubygem-acts-as-taggable-on \
 	rubygem-sidekiq>=5.0.0:devel/rubygem-sidekiq \
 	rubygem-sidekiq-cron>=0.6.0:devel/rubygem-sidekiq-cron \
 	rubygem-redis-namespace>=1.5.2:databases/rubygem-redis-namespace \
 	rubygem-sidekiq-limit_fetch>=3.4:devel/rubygem-sidekiq-limit_fetch \
 	rubygem-rufus-scheduler>=3.4.0:devel/rubygem-rufus-scheduler \
 	rubygem-httparty>=0.13.3:www/rubygem-httparty \
 	rubygem-rainbow>=2.1.0:devel/rubygem-rainbow \
 	rubygem-settingslogic>=2.0.9:devel/rubygem-settingslogic \
 	rubygem-re2>=1.0:devel/rubygem-re2 \
 	rubygem-version_sorter>=2.1.0:textproc/rubygem-version_sorter \
 	rubygem-redis-rails>=5.0.1:www/rubygem-redis-rails \
 	rubygem-redis>=3.2:databases/rubygem-redis \
 	rubygem-connection_pool>=2.0:net/rubygem-connection_pool \
 	rubygem-hipchat>=1.5.0:net-im/rubygem-hipchat \
 	rubygem-jira-ruby>=1.1.2:devel/rubygem-jira-ruby \
 	rubygem-gitlab-flowdock-git-hook>=1.0.1:www/rubygem-gitlab-flowdock-git-hook \
 	rubygem-gemnasium-gitlab-service>=0.2:devel/rubygem-gemnasium-gitlab-service \
 	rubygem-slack-notifier1>=1.5.1:devel/rubygem-slack-notifier1 \
 	rubygem-asana>=0.6.0:www/rubygem-asana \
 	rubygem-ruby-fogbugz>=0.2.1:devel/rubygem-ruby-fogbugz \
 	rubygem-kubeclient>=2.2.0:www/rubygem-kubeclient \
 	rubygem-d3_rails-rails4>=3.5.0:www/rubygem-d3_rails-rails4 \
 	rubygem-underscore-rails>=1.8.0:www/rubygem-underscore-rails \
 	rubygem-sanitize>=2.0:textproc/rubygem-sanitize \
 	rubygem-babosa>=1.0.2:textproc/rubygem-babosa \
 	rubygem-loofah>=2.0.3:textproc/rubygem-loofah \
 	rubygem-licensee>=8.7:devel/rubygem-licensee \
 	rubygem-rack-attack>=4.4.1:www/rubygem-rack-attack \
 	rubygem-ace-rails-ap>=4.1.0:www/rubygem-ace-rails-ap \
 	rubygem-mousetrap-rails>=1.4.6:www/rubygem-mousetrap-rails \
 	rubygem-charlock_holmes>=0.7.3:textproc/rubygem-charlock_holmes \
 	rubygem-oj2>=2.17.4:devel/rubygem-oj2 \
 	rubygem-chronic>=0.10.2:devel/rubygem-chronic \
 	rubygem-chronic_duration>=0.10.6:devel/rubygem-chronic_duration \
 	rubygem-webpack-rails>=0.9.10:www/rubygem-webpack-rails \
 	rubygem-rack-proxy>=0.6.0:www/rubygem-rack-proxy \
 	rubygem-sass-rails5>=5.0.6:textproc/rubygem-sass-rails5 \
 	rubygem-coffee-rails4>=4.1.0:devel/rubygem-coffee-rails4 \
 	rubygem-uglifier>=2.7.2:www/rubygem-uglifier \
 	rubygem-addressable>=2.3.8:www/rubygem-addressable \
 	rubygem-bootstrap-sass>=3.3.0:www/rubygem-bootstrap-sass \
 	rubygem-font-awesome-rails-rails4>=4.7:devel/rubygem-font-awesome-rails-rails4 \
 	rubygem-gemojione>=3.3:graphics/rubygem-gemojione \
 	rubygem-gon>=6.1.0:www/rubygem-gon \
 	rubygem-jquery-atwho-rails>=1.3.2:www/rubygem-jquery-atwho-rails \
 	rubygem-jquery-rails>=4.1.0:www/rubygem-jquery-rails \
 	rubygem-request_store>=1.3:devel/rubygem-request_store \
 	rubygem-select2-rails3>=3.5.9:www/rubygem-select2-rails3 \
 	rubygem-virtus>=1.0.1:devel/rubygem-virtus \
 	rubygem-net-ssh>=3.0.1:security/rubygem-net-ssh \
 	rubygem-base32>=0.3.2:converters/rubygem-base32 \
 	rubygem-sentry-raven>=2.4.0:devel/rubygem-sentry-raven \
 	rubygem-premailer-rails>=1.9.7:mail/rubygem-premailer-rails \
 	rubygem-ruby_parser>=3.8.4:devel/rubygem-ruby_parser \
 	rubygem-gettext_i18n_rails>=1.8.0:devel/rubygem-gettext_i18n_rails \
 	rubygem-gettext_i18n_rails_js>=1.2.0:devel/rubygem-gettext_i18n_rails_js \
 	rubygem-gettext>=3.2.2:devel/rubygem-gettext \
 	rubygem-peek>=1.0.1:devel/rubygem-peek \
 	rubygem-peek-gc>=0.0.2:devel/rubygem-peek-gc \
 	rubygem-peek-host>=1.0.0:devel/rubygem-peek-host \
 	rubygem-peek-performance_bar>=1.2.1:devel/rubygem-peek-performance_bar \
 	rubygem-peek-rblineprof>=0.2.0:devel/rubygem-peek-rblineprof \
 	rubygem-peek-redis>=1.2.0:devel/rubygem-peek-redis \
 	rubygem-peek-sidekiq>=1.0.3:devel/rubygem-peek-sidekiq \
 	rubygem-prometheus-client-mmap>=0.7.0.beta5:devel/rubygem-prometheus-client-mmap \
 	rubygem-octokit>=4.6.2:net/rubygem-octokit \
 	rubygem-mail_room>=0.9.1:mail/rubygem-mail_room \
 	rubygem-email_reply_trimmer>=0.1:mail/rubygem-email_reply_trimmer \
 	rubygem-html2text>=0:textproc/rubygem-html2text \
 	rubygem-ruby-prof>=0.16.2:devel/rubygem-ruby-prof \
 	rubygem-oauth2>=1.3.0:net/rubygem-oauth2 \
 	rubygem-paranoia>=2.2:databases/rubygem-paranoia \
 	rubygem-health_check>=2.6.0:devel/rubygem-health_check \
 	rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \
 	rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \
 	rubygem-gitaly>=0.8.0:net/rubygem-gitaly \
 	rubygem-toml-rb>=0.3.15:www/rubygem-toml-rb \
 	rubygem-flipper>=0.10.2:devel/rubygem-flipper \
 	rubygem-flipper-active_record>=0.10.2:databases/rubygem-flipper-active_record \
 	rubygem-rinku>=1.7.3:www/rubygem-rinku
 
 PGSQL_RUN_DEPENDS=	rubygem-pg>=0.18.2:databases/rubygem-pg \
 	rubygem-peek-pg>=1.3.0:databases/rubygem-peek-pg
 MYSQL_RUN_DEPENDS=	rubygem-mysql2>=0.4.5:databases/rubygem-mysql2 \
 	rubygem-peek-mysql2>=1.1.0:databases/rubygem-peek-mysql2
 
 USE_RUBY=	yes
 
 USE_RC_SUBR=	gitlab
 USE_GITHUB=	yes
 GH_ACCOUNT=	gitlabhq
 GH_PROJECT=	gitlabhq
 
 USERS=	git
 GROUPS=	git
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-post-patch-MYSQL-on:
-	${ECHO} "gem 'mysql2', '>= 0.3.16', group: :mysql" >> ${WRKSRC}/Gemfile
-	${ECHO} "gem 'peek-mysql2', '~> 1.1.0', group: :mysql" >> ${WRKSRC}/Gemfile
+post-patch-MYSQL-off:
+	${REINPLACE_CMD} -e "/gem 'mysql2'/d" ${WRKSRC}/Gemfile
+	${REINPLACE_CMD} -e "/gem 'peek-mysql2'/d" ${WRKSRC}/Gemfile
 	${CP} ${WRKSRC}/config/database.yml.mysql ${WRKSRC}/config/database.yml.sample
 
-post-patch-PGSQL-on:
-	${ECHO} "gem 'pg', '>= 0.18.2', group: :postgres" >> ${WRKSRC}/Gemfile
-	${ECHO} "gem 'peek-pg', '~> 1.3.0', group: :postgres" >> ${WRKSRC}/Gemfile
+post-patch-PGSQL-off:
+	${REINPLACE_CMD} -e "/gem 'pg'/d" ${WRKSRC}/Gemfile
+	${REINPLACE_CMD} -e "/gem 'peek-pg'/d" ${WRKSRC}/Gemfile
 	${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample
 
 do-install:
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 	${FIND} ${WRKSRC} -name '*.bak' -delete
 	${FIND} ${WRKSRC} -name '*.gitkeep' -delete
 	${FIND} ${WRKSRC} -name '*.gitignore' -delete
 	${FIND} ${WRKSRC} -name "Gemfile.lock" -delete
 	${MV} ${WRKSRC}/config/gitlab.yml.example ${WRKSRC}/config/gitlab.yml.sample
 	${MV} ${WRKSRC}/config/unicorn.rb.example ${WRKSRC}/config/unicorn.rb.sample
 	${MV} ${WRKSRC}/config/resque.yml.example ${WRKSRC}/config/resque.yml.sample
 	${MV} ${WRKSRC}/config/secrets.yml.example ${WRKSRC}/config/secrets.yml.sample
 	${MV} ${WRKSRC}/config/initializers/rack_attack.rb.example ${WRKSRC}/config/initializers/rack_attack.rb.sample
 	${MV} ${WRKSRC}/lib/support/nginx/gitlab ${WRKSRC}/lib/support/nginx/gitlab.sample
 	${MV} ${WRKSRC}/lib/support/nginx/gitlab-ssl ${WRKSRC}/lib/support/nginx/gitlab-ssl.sample
 	${MKDIR} ${STAGEDIR}/home/git/repositories
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/assets
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/uploads
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/cache
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/sessions
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/backups
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/tmp
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME})
 
 .include <bsd.port.mk>
Index: head/www/gitlab/files/patch-Gemfile
===================================================================
--- head/www/gitlab/files/patch-Gemfile	(revision 450128)
+++ head/www/gitlab/files/patch-Gemfile	(revision 450129)
@@ -1,367 +1,364 @@
 --- Gemfile.orig	2017-09-06 21:34:31 UTC
 +++ Gemfile
-@@ -1,48 +1,43 @@
+@@ -1,12 +1,12 @@
  source 'https://rubygems.org'
  
 -gem 'rails', '4.2.8'
 +gem 'rails', '>= 4.2.8'
  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'
+@@ -17,32 +17,31 @@ gem 'pg', '~> 0.18.2', group: :postgres
  
--# Supported DBs
--gem 'mysql2', '~> 0.3.16', group: :mysql
--gem 'pg', '~> 0.18.2', group: :postgres
--
  gem 'rugged', '~> 0.25.1.1'
  
 -gem 'faraday', '~> 0.11.0'
 +gem 'faraday', '>= 0.11.0'
  
  # Authentication libraries
  gem 'devise', '~> 4.2'
  gem 'doorkeeper', '~> 4.2.0'
  gem 'doorkeeper-openid_connect', '~> 1.1.0'
 -gem 'omniauth', '~> 1.4.2'
 +gem 'omniauth', '>= 1.4.2'
  gem 'omniauth-auth0', '~> 1.4.1'
  gem 'omniauth-azure-oauth2', '~> 0.0.6'
  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-google-oauth2', '~> 0.4.1'
 -gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
 +gem 'omniauth-google-oauth2', '>= 0.4.1'
  gem 'omniauth-oauth2-generic', '~> 0.2.2'
  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.3.0'
 -gem 'rack-oauth2', '~> 1.2.1'
 +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
-@@ -68,7 +63,7 @@ gem 'gollum-lib', '~> 4.2', require: fal
+@@ -68,7 +67,7 @@ gem 'gollum-lib', '~> 4.2', require: fal
  gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
  
  # Language detection
 -gem 'github-linguist', '~> 4.7.0', require: 'linguist'
 +gem 'github-linguist', '>= 4.7.0', require: 'linguist'
  
  # API
  gem 'grape', '~> 0.19.0'
-@@ -82,13 +77,13 @@ gem 'hashie-forbidden_attributes'
+@@ -82,13 +81,13 @@ gem 'hashie-forbidden_attributes'
  gem 'kaminari', '~> 0.17.0'
  
  # HAML
 -gem 'hamlit', '~> 2.6.1'
 +gem 'hamlit', '>= 2.6.1'
  
  # Files attachments
 -gem 'carrierwave', '~> 1.0'
 +gem 'carrierwave', '>= 1.0'
  
  # Drag and Drop UI
 -gem 'dropzonejs-rails', '~> 0.7.1'
 +gem 'dropzonejs-rails', '>= 0.7.1'
  
  # for backups
  gem 'fog-aws', '~> 0.9'
-@@ -97,10 +92,10 @@ gem 'fog-google', '~> 0.5'
+@@ -97,10 +96,10 @@ gem 'fog-google', '~> 0.5'
  gem 'fog-local', '~> 0.3'
  gem 'fog-openstack', '~> 0.1'
  gem 'fog-rackspace', '~> 0.1.1'
 -gem 'fog-aliyun', '~> 0.1.0'
 +gem 'fog-aliyun', '>= 0.1.0'
  
  # 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'
-@@ -110,31 +105,31 @@ gem 'seed-fu', '~> 2.3.5'
+@@ -110,31 +109,31 @@ gem 'seed-fu', '~> 2.3.5'
  
  # Markdown and HTML processing
  gem 'html-pipeline', '~> 1.11.0'
 -gem 'deckar01-task_list', '2.0.0'
 -gem 'gitlab-markup', '~> 1.5.1'
 +gem 'deckar01-task_list', '>= 2.0.0'
 +gem 'gitlab-markup', '>= 1.5.1'
  gem 'redcarpet', '~> 3.4'
  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.9'
  gem 'nokogiri', '~> 1.8.0'
  
  # 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
  
  # State machine
 -gem 'state_machines-activerecord', '~> 0.4.0'
 +gem 'state_machines-activerecord', '>= 0.4.0'
  # Run events after state machine commits
  gem 'after_commit_queue', '~> 1.3.0'
  
-@@ -151,10 +146,10 @@ gem 'sidekiq-limit_fetch', '~> 3.4'
+@@ -151,10 +150,10 @@ gem 'sidekiq-limit_fetch', '~> 3.4'
  gem 'rufus-scheduler', '~> 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'
-@@ -164,7 +159,7 @@ gem 're2', '~> 1.0.0'
+@@ -164,7 +163,7 @@ gem 're2', '~> 1.0.0'
  
  # Misc
  
 -gem 'version_sorter', '~> 2.1.0'
 +gem 'version_sorter', '>= 2.1.0'
  
  # Cache
  gem 'redis-rails', '~> 5.0.1'
-@@ -174,10 +169,10 @@ gem 'redis', '~> 3.2'
+@@ -174,10 +173,10 @@ gem 'redis', '~> 3.2'
  gem 'connection_pool', '~> 2.0'
  
  # HipChat integration
 -gem 'hipchat', '~> 1.5.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'
-@@ -195,7 +190,7 @@ gem 'asana', '~> 0.6.0'
+@@ -195,7 +194,7 @@ gem 'asana', '~> 0.6.0'
  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'
-@@ -204,7 +199,7 @@ gem 'd3_rails', '~> 3.5.0'
+@@ -204,7 +203,7 @@ 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
-@@ -214,7 +209,7 @@ gem 'loofah', '~> 2.0.3'
+@@ -214,7 +213,7 @@ gem 'loofah', '~> 2.0.3'
  gem 'licensee', '~> 8.7.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'
-@@ -233,143 +228,62 @@ gem 'chronic', '~> 0.10.2'
+@@ -233,34 +232,34 @@ gem 'chronic', '~> 0.10.2'
  gem 'chronic_duration', '~> 0.10.6'
  
  gem 'webpack-rails', '~> 0.9.10'
 -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.7'
  gem 'gemojione', '~> 3.3'
  gem 'gon', '~> 6.1.0'
  gem 'jquery-atwho-rails', '~> 1.3.2'
 -gem 'jquery-rails', '~> 4.1.0'
 -gem 'request_store', '~> 1.3'
 +gem 'jquery-rails', '>= 4.1.0'
 +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.4.0'
 +gem 'sentry-raven', '>= 2.4.0'
  
  gem 'premailer-rails', '~> 1.9.7'
  
  # I18n
  gem 'ruby_parser', '~> 3.8.4', require: false
  gem 'gettext_i18n_rails', '~> 1.8.0'
 -gem 'gettext_i18n_rails_js', '~> 1.2.0'
 +gem 'gettext_i18n_rails_js', '>= 1.2.0'
  gem 'gettext', '~> 3.2.2', require: false, group: :development
  
  # Perf bar
- gem 'peek', '~> 1.0.1'
+@@ -268,7 +267,7 @@ gem 'peek', '~> 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-mysql2', '~> 1.1.0', group: :mysql
 -gem 'peek-performance_bar', '~> 1.2.1'
--gem 'peek-pg', '~> 1.3.0', group: :postgres
 +gem 'peek-performance_bar', '>= 1.2.1'
+ gem 'peek-pg', '~> 1.3.0', group: :postgres
  gem 'peek-rblineprof', '~> 0.2.0'
  gem 'peek-redis', '~> 1.2.0'
- gem 'peek-sidekiq', '~> 1.0.3'
+@@ -276,100 +275,21 @@ gem 'peek-sidekiq', '~> 1.0.3'
  
  # 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
 -
    # Prometheus
    gem 'prometheus-client-mmap', '~>0.7.0.beta5'
  end
  
 -group :development do
 -  gem 'foreman', '~> 0.78.0'
 -  gem 'brakeman', '~> 3.6.0', require: false
 -
 -  gem 'letter_opener_web', '~> 1.3.0'
 -  gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
 -
 -  # Better errors handler
 -  gem 'better_errors', '~> 2.1.0'
 -  gem 'binding_of_caller', '~> 0.7.2'
 -
 -  # thin instead webrick
 -  gem 'thin', '~> 1.7.0'
 -end
 -
 -group :development, :test do
 -  gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
 -  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.0', require: false
 -  gem 'email_spec', '~> 1.6.0'
 -  gem 'json-schema', '~> 2.6.2'
 -  gem 'webmock', '~> 1.24.0'
 -  gem 'test_after_commit', '~> 1.1'
 -  gem 'sham_rack', '~> 1.3.6'
 -  gem 'timecop', '~> 0.8.0'
 -  gem 'concurrent-ruby', '~> 1.0.5'
 -end
 -
 -gem 'octokit', '~> 4.6.2'
 +gem 'octokit', '>= 4.6.2'
  
  gem 'mail_room', '~> 0.9.1'
  
 -gem 'email_reply_trimmer', '~> 0.1'
 +gem 'email_reply_trimmer', '>= 0.1'
  gem 'html2text'
  
  gem 'ruby-prof', '~> 0.16.2'
  
  # OAuth
 -gem 'oauth2', '~> 1.3.0'
 +gem 'oauth2', '>= 1.3.0'
  
  # Soft deletion
  gem 'paranoia', '~> 2.2'
-@@ -384,8 +298,10 @@ gem 'sys-filesystem', '~> 1.1.6'
+@@ -384,8 +304,10 @@ gem 'sys-filesystem', '~> 1.1.6'
  # Gitaly GRPC client
  gem 'gitaly', '~> 0.8.0'
  
 -gem 'toml-rb', '~> 0.3.15', require: false
 +gem 'toml-rb', '>= 0.3.15', require: false
  
  # Feature toggles
  gem 'flipper', '~> 0.10.2'
  gem 'flipper-active_record', '~> 0.10.2'
 +
 +gem 'rinku'