From owner-svn-ports-all@freebsd.org Wed Jan 17 20:54:01 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 25DD3EB6C4D; Wed, 17 Jan 2018 20:54:01 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F3C7581CC1; Wed, 17 Jan 2018 20:54:00 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3D4B51498E; Wed, 17 Jan 2018 20:54:00 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0HKs03D076628; Wed, 17 Jan 2018 20:54:00 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0HKrxOe076623; Wed, 17 Jan 2018 20:53:59 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201801172053.w0HKrxOe076623@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Wed, 17 Jan 2018 20:53:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459288 - in head/www/gitlab: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/www/gitlab: . files X-SVN-Commit-Revision: 459288 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jan 2018 20:54:01 -0000 Author: swills Date: Wed Jan 17 20:53:59 2018 New Revision: 459288 URL: https://svnweb.freebsd.org/changeset/ports/459288 Log: www/gitlab: update to 10.1.6 Approved by: idefix@fechner.net (maintainer, via private email) Obtained from: http://gitlab.toco-domains.de/FreeBSD/GitLab/commits/10.1 MFH: 2018Q1 Security: 65fab89f-2231-46db-8541-978f4e87f32a Modified: head/www/gitlab/Makefile (contents, props changed) head/www/gitlab/distinfo (contents, props changed) head/www/gitlab/files/patch-Gemfile (contents, props changed) head/www/gitlab/pkg-plist (contents, props changed) Modified: head/www/gitlab/Makefile ============================================================================== --- head/www/gitlab/Makefile Wed Jan 17 20:50:17 2018 (r459287) +++ head/www/gitlab/Makefile Wed Jan 17 20:53:59 2018 (r459288) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= gitlab -PORTVERSION= 10.1.5 +PORTVERSION= 10.1.6 DISTVERSIONPREFIX= v -PORTREVISION= 8 CATEGORIES= www devel MAINTAINER= idefix@fechner.net @@ -102,7 +101,7 @@ RUN_DEPENDS= git>=2.14.1:devel/git \ 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-rouge2>=2.0:textproc/rubygem-rouge2 \ rubygem-truncato>=0.7.9:textproc/rubygem-truncato \ rubygem-bootstrap_form>=2.7.0:devel/rubygem-bootstrap_form \ rubygem-nokogiri>=1.8.1:textproc/rubygem-nokogiri \ Modified: head/www/gitlab/distinfo ============================================================================== --- head/www/gitlab/distinfo Wed Jan 17 20:50:17 2018 (r459287) +++ head/www/gitlab/distinfo Wed Jan 17 20:53:59 2018 (r459288) @@ -1,3 +1,3 @@ -TIMESTAMP = 1512812405 -SHA256 (gitlabhq-gitlabhq-v10.1.5_GH0.tar.gz) = 8b8f8d88757bb7cc4f204c31f3d67fe4f4191fb25d1e4df81cf2c4361e10a725 -SIZE (gitlabhq-gitlabhq-v10.1.5_GH0.tar.gz) = 41727928 +TIMESTAMP = 1516175210 +SHA256 (gitlabhq-gitlabhq-v10.1.6_GH0.tar.gz) = b01bd5e10adb5b21c4cafc5e9fe5fa388c52fe7546708d0ed58f57644bc76b9c +SIZE (gitlabhq-gitlabhq-v10.1.6_GH0.tar.gz) = 41739152 Modified: head/www/gitlab/files/patch-Gemfile ============================================================================== --- head/www/gitlab/files/patch-Gemfile Wed Jan 17 20:50:17 2018 (r459287) +++ head/www/gitlab/files/patch-Gemfile Wed Jan 17 20:53:59 2018 (r459288) @@ -1,4 +1,4 @@ ---- Gemfile.orig 2017-12-07 12:02:52 UTC +--- Gemfile.orig 2018-01-11 16:23:59 UTC +++ Gemfile @@ -1,49 +1,49 @@ source 'https://rubygems.org' @@ -48,10 +48,11 @@ -gem 'omniauth-saml', '~> 1.7.0' -gem 'omniauth-shibboleth', '~> 1.2.0' -gem 'omniauth-twitter', '~> 1.2.0' +-gem 'omniauth_crowd', '~> 2.2.0' +gem 'omniauth-saml', '>= 1.7.0' +gem 'omniauth-shibboleth', '>= 1.2.0' +gem 'omniauth-twitter', '>= 1.2.0' - gem 'omniauth_crowd', '~> 2.2.0' ++gem 'omniauth_crowd', '>= 2.2.0' gem 'omniauth-authentiq', '~> 0.3.1' -gem 'rack-oauth2', '~> 1.2.1' +gem 'rack-oauth2', '>= 1.2.1' @@ -174,7 +175,7 @@ +gem 'version_sorter', '>= 2.1.0' # Cache - gem 'redis-rails', '~> 5.0.1' + gem 'redis-rails', '~> 5.0.2' # Redis -gem 'redis', '~> 3.2' Modified: head/www/gitlab/pkg-plist ============================================================================== --- head/www/gitlab/pkg-plist Wed Jan 17 20:50:17 2018 (r459287) +++ head/www/gitlab/pkg-plist Wed Jan 17 20:53:59 2018 (r459288) @@ -3434,6 +3434,7 @@ %%WWWDIR%%/app/serializers/container_tags_serializer.rb %%WWWDIR%%/app/serializers/deploy_key_entity.rb %%WWWDIR%%/app/serializers/deploy_key_serializer.rb +%%WWWDIR%%/app/serializers/deploy_keys_project_entity.rb %%WWWDIR%%/app/serializers/deployment_entity.rb %%WWWDIR%%/app/serializers/deployment_serializer.rb %%WWWDIR%%/app/serializers/discussion_entity.rb @@ -5851,6 +5852,8 @@ %%WWWDIR%%/db/migrate/20171006091000_add_name_foreign_key_to_ci_build_trace_sections.rb %%WWWDIR%%/db/migrate/20171012101043_add_circuit_breaker_properties_to_application_settings.rb %%WWWDIR%%/db/migrate/20171017145932_add_new_circuitbreaker_settings_to_application_settings.rb +%%WWWDIR%%/db/migrate/20171211145425_add_can_push_to_deploy_keys_projects.rb +%%WWWDIR%%/db/migrate/20171215113714_populate_can_push_from_deploy_keys_projects.rb %%WWWDIR%%/db/migrate/limits_to_mysql.rb %%WWWDIR%%/db/migrate/markdown_cache_limits_to_mysql.rb %%WWWDIR%%/db/migrate/merge_request_diff_file_limits_to_mysql.rb @@ -5938,6 +5941,8 @@ %%WWWDIR%%/db/post_migrate/20170927112318_update_legacy_diff_notes_type_for_import.rb %%WWWDIR%%/db/post_migrate/20170927112319_update_notes_type_for_import.rb %%WWWDIR%%/db/post_migrate/20171005130944_schedule_create_gpg_key_subkeys_from_gpg_keys.rb +%%WWWDIR%%/db/post_migrate/20171215121205_post_populate_can_push_from_deploy_keys_projects.rb +%%WWWDIR%%/db/post_migrate/20171215121259_remove_can_push_from_keys.rb @(git,,) %%WWWDIR%%/db/schema.rb %%WWWDIR%%/db/seeds.rb %%WWWDIR%%/doc/README.md @@ -8096,6 +8101,7 @@ %%WWWDIR%%/lib/gitlab/middleware/read_only.rb %%WWWDIR%%/lib/gitlab/middleware/static.rb %%WWWDIR%%/lib/gitlab/middleware/webpack_proxy.rb +%%WWWDIR%%/lib/gitlab/o_auth.rb %%WWWDIR%%/lib/gitlab/o_auth/auth_hash.rb %%WWWDIR%%/lib/gitlab/o_auth/provider.rb %%WWWDIR%%/lib/gitlab/o_auth/session.rb @@ -8519,12 +8525,14 @@ %%WWWDIR%%/spec/controllers/import/gitea_controller_spec.rb %%WWWDIR%%/spec/controllers/import/github_controller_spec.rb %%WWWDIR%%/spec/controllers/import/gitlab_controller_spec.rb +%%WWWDIR%%/spec/controllers/import/gitlab_projects_controller_spec.rb %%WWWDIR%%/spec/controllers/import/google_code_controller_spec.rb %%WWWDIR%%/spec/controllers/invites_controller_spec.rb %%WWWDIR%%/spec/controllers/metrics_controller_spec.rb %%WWWDIR%%/spec/controllers/notification_settings_controller_spec.rb %%WWWDIR%%/spec/controllers/oauth/applications_controller_spec.rb %%WWWDIR%%/spec/controllers/oauth/authorizations_controller_spec.rb +%%WWWDIR%%/spec/controllers/omniauth_callbacks_controller_spec.rb %%WWWDIR%%/spec/controllers/passwords_controller_spec.rb %%WWWDIR%%/spec/controllers/profiles/accounts_controller_spec.rb %%WWWDIR%%/spec/controllers/profiles/avatars_controller_spec.rb @@ -9570,6 +9578,8 @@ %%WWWDIR%%/spec/javascripts/new_branch_spec.js %%WWWDIR%%/spec/javascripts/notebook/cells/code_spec.js %%WWWDIR%%/spec/javascripts/notebook/cells/markdown_spec.js +%%WWWDIR%%/spec/javascripts/notebook/cells/output/html_sanitize_tests.js +%%WWWDIR%%/spec/javascripts/notebook/cells/output/html_spec.js %%WWWDIR%%/spec/javascripts/notebook/cells/output/index_spec.js %%WWWDIR%%/spec/javascripts/notebook/cells/prompt_spec.js %%WWWDIR%%/spec/javascripts/notebook/index_spec.js @@ -10869,6 +10879,7 @@ %%WWWDIR%%/spec/services/projects/enable_deploy_key_service_spec.rb %%WWWDIR%%/spec/services/projects/fork_service_spec.rb %%WWWDIR%%/spec/services/projects/forks_count_service_spec.rb +%%WWWDIR%%/spec/services/projects/gitlab_projects_import_service_spec.rb %%WWWDIR%%/spec/services/projects/hashed_storage_migration_service_spec.rb %%WWWDIR%%/spec/services/projects/housekeeping_service_spec.rb %%WWWDIR%%/spec/services/projects/import_service_spec.rb