Index: Makefile =================================================================== --- Makefile (revision 414437) +++ Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab -PORTVERSION= 8.5.5 +PORTVERSION= 8.5.11 DISTVERSIONPREFIX= v CATEGORIES= www devel Index: distinfo =================================================================== --- distinfo (revision 414437) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (gitlabhq-gitlabhq-v8.5.5_GH0.tar.gz) = 859ec6142095d459b1587616df6c83063e87a8c7417ab8606100588525d03e2d -SIZE (gitlabhq-gitlabhq-v8.5.5_GH0.tar.gz) = 15179973 +SHA256 (gitlabhq-gitlabhq-v8.5.11_GH0.tar.gz) = 084853403d55e53587d2d03a30ffc03acd36561fcc3783f0d7c8e048d3303c49 +SIZE (gitlabhq-gitlabhq-v8.5.11_GH0.tar.gz) = 15181985 Index: files/patch-Gemfile =================================================================== --- files/patch-Gemfile (revision 414437) +++ files/patch-Gemfile (working copy) @@ -1,4 +1,4 @@ ---- Gemfile.orig 2016-03-10 19:32:49 UTC +--- Gemfile.orig 2016-04-20 15:59:09 UTC +++ Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" @@ -55,7 +55,8 @@ -gem 'devise-two-factor', '~> 2.0.0' +gem 'devise-two-factor', '>= 2.0.0' gem 'rqrcode-rails3', '~> 0.1.7' - gem 'attr_encrypted', '~> 1.3.4' +-gem 'attr_encrypted', '~> 1.3.4' ++gem 'attr_encrypted', '>= 1.3.4' # Browser detection -gem "browser", '~> 1.0.0' Index: pkg-plist =================================================================== --- pkg-plist (revision 414437) +++ pkg-plist (working copy) @@ -1419,6 +1419,7 @@ %%WWWDIR%%/config/initializers/public_key.rb %%WWWDIR%%/config/initializers/rack_attack_git_basic_auth.rb %%WWWDIR%%/config/initializers/rack_lineprof.rb +%%WWWDIR%%/config/initializers/redis_config.rb %%WWWDIR%%/config/initializers/relative_url.rb.sample %%WWWDIR%%/config/initializers/secret_token.rb %%WWWDIR%%/config/initializers/sentry.rb @@ -2548,6 +2549,7 @@ %%WWWDIR%%/lib/gitlab/email/message/repository_push.rb %%WWWDIR%%/lib/gitlab/email/receiver.rb %%WWWDIR%%/lib/gitlab/email/reply_parser.rb +%%WWWDIR%%/lib/gitlab/exclusive_lease.rb %%WWWDIR%%/lib/gitlab/fogbugz_import/client.rb %%WWWDIR%%/lib/gitlab/fogbugz_import/importer.rb %%WWWDIR%%/lib/gitlab/fogbugz_import/project_creator.rb @@ -2775,6 +2777,7 @@ %%WWWDIR%%/spec/controllers/projects_controller_spec.rb %%WWWDIR%%/spec/controllers/root_controller_spec.rb %%WWWDIR%%/spec/controllers/sent_notification_controller_spec.rb +%%WWWDIR%%/spec/controllers/sessions_controller_spec.rb %%WWWDIR%%/spec/controllers/snippets_controller_spec.rb %%WWWDIR%%/spec/controllers/uploads_controller_spec.rb %%WWWDIR%%/spec/controllers/users_controller_spec.rb @@ -2884,6 +2887,7 @@ %%WWWDIR%%/spec/helpers/blob_helper_spec.rb %%WWWDIR%%/spec/helpers/broadcast_messages_helper_spec.rb %%WWWDIR%%/spec/helpers/ci_status_helper_spec.rb +%%WWWDIR%%/spec/helpers/commits_helper_spec.rb %%WWWDIR%%/spec/helpers/diff_helper_spec.rb %%WWWDIR%%/spec/helpers/emails_helper_spec.rb %%WWWDIR%%/spec/helpers/events_helper_spec.rb @@ -2994,6 +2998,7 @@ %%WWWDIR%%/spec/lib/gitlab/email/message/repository_push_spec.rb %%WWWDIR%%/spec/lib/gitlab/email/receiver_spec.rb %%WWWDIR%%/spec/lib/gitlab/email/reply_parser_spec.rb +%%WWWDIR%%/spec/lib/gitlab/exclusive_lease_spec.rb %%WWWDIR%%/spec/lib/gitlab/git_access_spec.rb %%WWWDIR%%/spec/lib/gitlab/git_access_wiki_spec.rb %%WWWDIR%%/spec/lib/gitlab/github_import/client_spec.rb