Index: head/www/gitlab/Makefile
===================================================================
--- head/www/gitlab/Makefile	(revision 423956)
+++ head/www/gitlab/Makefile	(revision 423957)
@@ -1,193 +1,193 @@
 # Created by: Torsten Zuehlsdorff <ports@toco-domains.de>
 # $FreeBSD$
 
 PORTNAME=	gitlab
 PORTVERSION=	8.9.6
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www devel
 
 MAINTAINER=	tz@FreeBSD.org
 COMMENT=	Web GUI for managing git repositories
 
 LICENSE=	MIT
 
 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!
 RUN_DEPENDS=	git>=2.7.4:devel/git \
 	gitlab-shell>=3.0.0:devel/gitlab-shell\
 	gitlab-workhorse>=0.7.5:www/gitlab-workhorse \
 	redis>=2.8.23:databases/redis \
 	rubygem-rails4>=4.2.6: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.6:devel/rubygem-sprockets3 \
 	rubygem-default_value_for>=3.0.1:devel/rubygem-default_value_for \
 	rubygem-pg>=0.18.2:databases/rubygem-pg \
 	rubygem-devise>=4.0:devel/rubygem-devise \
 	rubygem-doorkeeper>=3.1:security/rubygem-doorkeeper \
 	rubygem-omniauth>=1.3.1: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-bitbucket>=0.0.2:security/rubygem-omniauth-bitbucket \
 	rubygem-omniauth-cas3>=1.1.2:security/rubygem-omniauth-cas3 \
 	rubygem-omniauth-facebook>=3.0.0:net/rubygem-omniauth-facebook \
 	rubygem-omniauth-github>=1.1.1:net/rubygem-omniauth-github \
 	rubygem-omniauth-gitlab>=1.0.0:security/rubygem-omniauth-gitlab \
 	rubygem-omniauth-google-oauth2>=0.2.0:net/rubygem-omniauth-google-oauth2 \
 	rubygem-omniauth-saml>=1.6.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-rack-oauth2>=1.2.1:security/rubygem-rack-oauth2 \
 	rubygem-jwt>=1.0: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-u2f>=0.2.1:net/rubygem-u2f \
 	rubygem-browser>=2.2:www/rubygem-browser \
 	rubygem-gitlab_git>=10.2:devel/rubygem-gitlab_git \
 	rubygem-gitlab_omniauth-ldap>=1.2.1:net/rubygem-gitlab_omniauth-ldap \
 	rubygem-gollum-lib>=4.1.0:www/rubygem-gollum-lib \
 	rubygem-gollum-rugged_adapter>=0.4.2:www/rubygem-gollum-rugged_adapter \
 	rubygem-github-linguist>=4.7.0:textproc/rubygem-github-linguist \
 	rubygem-grape>=0.13.0:devel/rubygem-grape \
 	rubygem-grape-entity>=0.4.2:devel/rubygem-grape-entity \
 	rubygem-rack-cors>=0.4.0:www/rubygem-rack-cors \
 	rubygem-kaminari-rails4>=0.17.0:www/rubygem-kaminari-rails4 \
 	rubygem-haml-rails-rails4>=0.9.0:www/rubygem-haml-rails-rails4 \
 	rubygem-carrierwave>=0.10.0:www/rubygem-carrierwave \
 	rubygem-dropzonejs-rails>=0.7.1:www/rubygem-dropzonejs-rails \
 	rubygem-fog-aws>=0.9:net/rubygem-fog-aws \
 	rubygem-fog-azure>=0.0:net/rubygem-fog-azure \
 	rubygem-fog-core>=1.40:devel/rubygem-fog-core \
 	rubygem-fog-local>=0.3:net/rubygem-fog-local \
 	rubygem-fog-google>=0.3:net/rubygem-fog-google \
 	rubygem-fog-openstack>=0.1:net/rubygem-fog-openstack \
 	rubygem-unf>=0.1.4:textproc/rubygem-unf \
 	rubygem-six>=0.2.0:security/rubygem-six \
 	rubygem-seed-fu>=2.3.5:databases/rubygem-seed-fu \
 	rubygem-html-pipeline1>=1.11.0:textproc/rubygem-html-pipeline1 \
 	rubygem-task_list>=1.0.2:www/rubygem-task_list \
 	rubygem-github-markup>=1.3.1:textproc/rubygem-github-markup \
 	rubygem-redcarpet>=3.3.3:textproc/rubygem-redcarpet \
 	rubygem-redcloth>=4.3.2:www/rubygem-redcloth \
 	rubygem-rdoc>=3.6: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-rouge>=1.11:textproc/rubygem-rouge \
 	rubygem-nokogiri>=1.6.7.2:textproc/rubygem-nokogiri  \
 	rubygem-diffy>=3.0.3:textproc/rubygem-diffy \
 	rubygem-unicorn>=4.9.0:www/rubygem-unicorn \
 	rubygem-unicorn-worker-killer>=0.4.2:www/rubygem-unicorn-worker-killer \
 	rubygem-state_machines-activerecord>=0.4.0:databases/rubygem-state_machines-activerecord \
 	rubygem-after_commit_queue>=0:databases/rubygem-after_commit_queue \
 	rubygem-acts-as-taggable-on3>=3.4.0:www/rubygem-acts-as-taggable-on3 \
 	rubygem-sinatra>=1.4.4:www/rubygem-sinatra \
 	rubygem-sidekiq>=4.0:devel/rubygem-sidekiq \
 	rubygem-sidekiq-cron>=0.4.0:devel/rubygem-sidekiq-cron \
 	rubygem-redis-namespace>=0:databases/rubygem-redis-namespace \
 	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-version_sorter>=2.0.0:textproc/rubygem-version_sorter \
 	rubygem-redis-rails>=4.0.0:www/rubygem-redis-rails \
 	rubygem-redis>=3.2:databases/rubygem-redis \
 	rubygem-connection_pool>=2.0:net/rubygem-connection_pool \
 	rubygem-tinder>=1.10.0:net-im/rubygem-tinder \
 	rubygem-hipchat>=1.5.0:net-im/rubygem-hipchat \
 	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-notifier>=1.2.0:devel/rubygem-slack-notifier \
 	rubygem-asana>=0.4.0:www/rubygem-asana \
 	rubygem-ruby-fogbugz>=0.2.1:devel/rubygem-ruby-fogbugz \
 	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.0:devel/rubygem-licensee \
 	rubygem-rack-attack>=4.3.1:www/rubygem-rack-attack \
 	rubygem-ace-rails-ap>=4.0.2: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-chronic_duration>=0.10.6:devel/rubygem-chronic_duration \
 	rubygem-sass-rails5>=5.0.0:textproc/rubygem-sass-rails5 \
 	rubygem-coffee-rails4>=4.1.0:devel/rubygem-coffee-rails4 \
 	rubygem-uglifier>=2.7.2:www/rubygem-uglifier \
 	rubygem-turbolinks-classic>=2.5.0:www/rubygem-turbolinks-classic \
 	rubygem-jquery-turbolinks>=2.1.0:www/rubygem-jquery-turbolinks \
 	rubygem-addressable>=2.3.8:www/rubygem-addressable \
 	rubygem-bootstrap-sass>=3.3.0:www/rubygem-bootstrap-sass \
 	rubygem-font-awesome-rails-rails4>=4.6.1:devel/rubygem-font-awesome-rails-rails4 \
 	rubygem-gitlab_emoji>=0.3:graphics/rubygem-gitlab_emoji \
 	rubygem-gon>=6.0.1:www/rubygem-gon \
 	rubygem-jquery-atwho-rails-rails4>=1.3.2:www/rubygem-jquery-atwho-rails-rails4 \
 	rubygem-jquery-rails4>=4.1.0:www/rubygem-jquery-rails4 \
 	rubygem-jquery-ui-rails-rails4>=5.0.0:www/rubygem-jquery-ui-rails-rails4 \
 	rubygem-request_store>=1.3.0:devel/rubygem-request_store \
 	rubygem-select2-rails>=3.5.9:www/rubygem-select2-rails \
 	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>=0.15.4:devel/rubygem-sentry-raven \
 	rubygem-premailer-rails>=1.9.0:mail/rubygem-premailer-rails \
 	rubygem-gitlab_meta>=7.0:devel/rubygem-gitlab_meta \
 	rubygem-newrelic_rpm>=3.9.4.245:devel/rubygem-newrelic_rpm \
 	rubygem-newrelic-grape>=0:devel/rubygem-newrelic-grape \
 	rubygem-newrelic_rpm>=3.14:devel/rubygem-newrelic_rpm \
 	rubygem-octokit>=4.3.0:net/rubygem-octokit \
 	rubygem-mail_room>=0.8:mail/rubygem-mail_room \
 	rubygem-email_reply_parser>=0.5.8:mail/rubygem-email_reply_parser \
 	rubygem-activerecord-deprecated_finders>=1.0.3:devel/rubygem-activerecord-deprecated_finders \
 	rubygem-activerecord-session_store>=1.0.0:databases/rubygem-activerecord-session_store \
 	rubygem-nested_form>=0.3.2:www/rubygem-nested_form \
 	rubygem-oauth2>=1.0.0:net/rubygem-oauth2 \
 	rubygem-paranoia>=2.0:databases/rubygem-paranoia \
 	rubygem-health_check>=1.5.1:devel/rubygem-health_check \
 	rubygem-rinku>=1.7.3:www/rubygem-rinku
 
 USE=	pgsql=yes
 WANT=	pgsql=9.1+
 
 USE_RUBY=	yes
 
 USE_RC_SUBR=	gitlab
 USE_GITHUB=	yes
 GH_ACCOUNT=	gitlabhq
 GH_PROJECT=	gitlabhq
 
 USERS=	git
 GROUPS=	git
 
 .include <bsd.port.options.mk>
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 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
 	${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample
 
 	${MKDIR} ${STAGEDIR}/home/git/repositories
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/assets
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/cache
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/sessions
 	(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 423956)
+++ head/www/gitlab/files/patch-Gemfile	(revision 423957)
@@ -1,270 +1,272 @@
 --- Gemfile.orig	2016-07-11 19:38:44 UTC
 +++ Gemfile
 @@ -1,6 +1,6 @@
  source "https://rubygems.org"
  
 -gem 'rails', '4.2.6'
 +gem 'rails', '>= 4.2.6'
  gem 'rails-deprecated_sanitizer', '~> 1.0.3'
  
  # Responders respond_to and respond_with
-@@ -8,13 +8,12 @@ gem 'responders', '~> 2.0'
+@@ -8,14 +8,13 @@ gem 'responders', '~> 2.0'
  
  # Specify a sprockets version due to increased performance
  # See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069
 -gem 'sprockets', '~> 3.6.0'
 +gem 'sprockets', '>= 3.6.0'
  
  # Default values for AR models
 -gem "default_value_for", "~> 3.0.0"
 +gem "default_value_for", ">= 3.0.0"
  
  # Supported DBs
 -gem "mysql2", '~> 0.3.16', group: :mysql
- gem "pg", '~> 0.18.2', group: :postgres
+-gem "pg", '~> 0.18.2', group: :postgres
++gem "pg", '>= 0.18.2', group: :postgres
  
  # Authentication libraries
+ gem 'devise',                 '~> 4.0'
 @@ -28,13 +27,12 @@ gem 'omniauth-cas3',          '~> 1.1.2'
  gem 'omniauth-facebook',      '~> 3.0.0'
  gem 'omniauth-github',        '~> 1.1.1'
  gem 'omniauth-gitlab',        '~> 1.0.0'
 -gem 'omniauth-google-oauth2', '~> 0.2.0'
 -gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
 +gem 'omniauth-google-oauth2', '>= 0.2.0'
  gem 'omniauth-saml',          '~> 1.6.0'
  gem 'omniauth-shibboleth',    '~> 1.2.0'
  gem 'omniauth-twitter',       '~> 1.2.0'
  gem 'omniauth_crowd',         '~> 2.2.0'
 -gem 'rack-oauth2',            '~> 1.2.1'
 +gem 'rack-oauth2',            '>= 1.2.1'
  gem 'jwt'
  
  # Spam and anti-bot protection
 @@ -61,15 +59,15 @@ gem 'gitlab_omniauth-ldap', '~> 1.2.1', 
  
  # Git Wiki
  # Required manually in config/initializers/gollum.rb to control load order
 -gem 'gollum-lib', '~> 4.1.0', require: false
 +gem 'gollum-lib', '>= 4.1.0', require: false
  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.13.0'
 -gem 'grape-entity', '~> 0.4.2'
 +gem 'grape',        '>= 0.13.0'
 +gem 'grape-entity', '>= 0.4.2'
  gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
  
  # Pagination
 @@ -79,7 +77,7 @@ gem "kaminari", "~> 0.17.0"
  gem "haml-rails", '~> 0.9.0'
  
  # Files attachments
 -gem "carrierwave", '~> 0.10.0'
 +gem "carrierwave", '>= 0.10.0'
  
  # Drag and Drop UI
  gem 'dropzonejs-rails', '~> 0.7.1'
 @@ -104,26 +102,26 @@ gem "seed-fu", '~> 2.3.5'
  # Markdown and HTML processing
  gem 'html-pipeline', '~> 1.11.0'
  gem 'task_list',     '~> 1.0.2', require: 'task_list/railtie'
 -gem 'github-markup', '~> 1.3.1'
 +gem 'github-markup', '>= 1.3.1'
  gem 'redcarpet',     '~> 3.3.3'
  gem 'RedCloth',      '~> 4.3.2'
 -gem 'rdoc',          '~>3.6'
 +gem 'rdoc',          '>= 3.6'
  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 'rouge',         '~> 1.11'
 +gem 'rouge',         '>= 1.11'
  
  # 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'
  
  # Diffs
 -gem 'diffy', '~> 3.0.3'
 +gem 'diffy', '>= 3.0.3'
  
  # Application server
  group :unicorn do
 -  gem "unicorn", '~> 4.9.0'
 +  gem "unicorn", '>= 4.9.0'
    gem 'unicorn-worker-killer', '~> 0.4.2'
  end
  
 @@ -174,10 +172,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0.
  gem "gemnasium-gitlab-service", "~> 0.2"
  
  # Slack integration
 -gem "slack-notifier", "~> 1.2.0"
 +gem "slack-notifier", ">= 1.2.0"
  
  # Asana integration
 -gem 'asana', '~> 0.4.0'
 +gem 'asana', '>= 0.4.0'
  
  # FogBugz integration
  gem 'ruby-fogbugz', '~> 0.2.1'
 @@ -189,17 +187,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.3.1'
 +gem "rack-attack", '>= 4.3.1'
  
  # Ace editor
  gem 'ace-rails-ap', '~> 4.0.2'
 @@ -215,11 +213,11 @@ gem 'chronic_duration', '~> 0.10.6'
  
  gem "sass-rails", '~> 5.0.0'
  gem "coffee-rails", '~> 4.1.0'
 -gem "uglifier", '~> 2.7.2'
 +gem "uglifier", '>= 2.7.2'
  gem 'turbolinks', '~> 2.5.0'
  gem 'jquery-turbolinks', '~> 2.1.0'
  
 -gem 'addressable',        '~> 2.3.8'
 +gem 'addressable',        '>= 2.3.8'
  gem 'bootstrap-sass',     '~> 3.3.0'
  gem 'font-awesome-rails', '~> 4.6.1'
  gem 'gitlab_emoji',       '~> 0.3.0'
 @@ -227,10 +225,10 @@ gem 'gon',                '~> 6.0.1'
  gem 'jquery-atwho-rails', '~> 1.3.2'
  gem 'jquery-rails',       '~> 4.1.0'
  gem 'jquery-ui-rails',    '~> 5.0.0'
 -gem 'request_store',      '~> 1.3.0'
 +gem 'request_store',      '>= 1.3.0'
  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
 @@ -238,90 +236,6 @@ gem 'sentry-raven', '~> 0.15'
  
  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"
 -  gem 'brakeman', '~> 3.3.0', require: false
 -
 -  gem 'letter_opener_web', '~> 1.3.0'
 -  gem 'quiet_assets', '~> 1.0.2'
 -  gem 'rerun', '~> 0.11.0'
 -  gem 'bullet', require: false
 -  gem 'rblineprof', 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'
 -
 -  # Docs generator
 -  gem "sdoc", '~> 0.3.20'
 -
 -  # thin instead webrick
 -  gem 'thin', '~> 1.6.1'
 -end
 -
 -group :development, :test do
 -  gem 'byebug', platform: :mri
 -  gem 'pry-rails'
 -
 -  gem 'awesome_print', '~> 1.2.0', require: false
 -  gem 'fuubar', '~> 2.0.0'
 -
 -  gem 'database_cleaner',   '~> 1.4.0'
 -  gem 'factory_girl_rails', '~> 4.6.0'
 -  gem 'rspec-rails',        '~> 3.4.0'
 -  gem 'rspec-retry'
 -  gem 'spinach-rails',      '~> 0.2.1'
 -  gem 'spinach-rerun-reporter', '~> 0.0.2'
 -
 -  # 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.0.0'
 -
 -  gem 'capybara',            '~> 2.6.2'
 -  gem 'capybara-screenshot', '~> 1.0.0'
 -  gem 'poltergeist',         '~> 1.9.0'
 -
 -  gem 'teaspoon', '~> 1.1.0'
 -  gem 'teaspoon-jasmine', '~> 2.2.0'
 -
 -  gem 'spring',                   '~> 1.7.0'
 -  gem 'spring-commands-rspec',    '~> 1.0.4'
 -  gem 'spring-commands-spinach',  '~> 1.1.0'
 -  gem 'spring-commands-teaspoon', '~> 0.0.2'
 -
 -  gem 'rubocop', '~> 0.40.0', require: false
 -  gem 'rubocop-rspec', '~> 1.5.0', require: false
 -  gem 'scss_lint', '~> 0.47.0', require: false
 -  gem 'coveralls', '~> 0.8.2', require: false
 -  gem 'simplecov', '~> 0.11.0', require: false
 -  gem 'flog', require: false
 -  gem 'flay', require: false
 -  gem 'bundler-audit', require: false
 -
 -  gem 'benchmark-ips', require: false
 -
 -  gem "license_finder", require: false
 -  gem 'knapsack'
 -end
 -
 -group :test do
 -  gem 'shoulda-matchers', '~> 2.8.0', require: false
 -  gem 'email_spec', '~> 1.6.0'
 -  gem 'webmock', '~> 1.21.0'
 -  gem 'test_after_commit', '~> 0.4.2'
 -  gem 'sham_rack'
 -end
 -
  group :production do
    gem "gitlab_meta", '7.0'
  end
 @@ -339,10 +253,12 @@ gem 'activerecord-session_store', '~> 1.
  gem "nested_form", '~> 0.3.2'
  
  # OAuth
 -gem 'oauth2', '~> 1.0.0'
 +gem 'oauth2', '>= 1.0.0'
  
  # Soft deletion
  gem "paranoia", "~> 2.0"
  
 +gem "rinku"
 +
  # Health check
  gem 'health_check', '~> 1.5.1'