3 files changed, 32 insertions, 8 deletions

diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 967d3d157830..381971302644 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-ce
-PORTVERSION=	11.7.0
+PORTVERSION=	11.7.3
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -17,8 +17,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 # for the options
 MY_DEPENDS=	git>=2.16.2:devel/git \
 	gitlab-shell>=8.4.4:devel/gitlab-shell \
-	gitlab-workhorse>=8.0.0:www/gitlab-workhorse \
-	gitaly>=1.12.1:devel/gitaly \
+	gitlab-workhorse>=8.0.1:www/gitlab-workhorse \
+	gitaly>=1.12.2:devel/gitaly \
 	gitlab-pages>=1.3.1:www/gitlab-pages \
 	redis>=3.2.12:databases/redis \
 	npm>=4.3.0:www/npm \
@@ -59,6 +59,7 @@ MY_DEPENDS=	git>=2.16.2:devel/git \
 	rubygem-attr_encrypted>=3.1.0:security/rubygem-attr_encrypted \
 	rubygem-u2f0>=0.2.1:net/rubygem-u2f0 \
 	rubygem-validates_hostname>=1.0.6:dns/rubygem-validates_hostname \
+	rubygem-rubyzip>=1.2.2:archivers/rubygem-rubyzip \
 	rubygem-browser>=2.5:www/rubygem-browser \
 	rubygem-gpgme>=2.0.18:security/rubygem-gpgme \
 	rubygem-gitlab_omniauth-ldap20>=2.0.4:net/rubygem-gitlab_omniauth-ldap20 \
@@ -220,7 +221,7 @@ USE_RC_SUBR=	gitlab
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags
-GL_COMMIT=	1d9280e16514e01f02674591634befb8f765e858
+GL_COMMIT=	3424476b4c9f17c11b969ab00e9be80f8c635c02
 
 USERS=	git
 GROUPS=	git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index 6890cd9d531e..b2e37a5af1fc 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548339325
-SHA256 (gitlab-org-gitlab-ce-1d9280e16514e01f02674591634befb8f765e858_GL0.tar.gz) = 71d11bda48e84d519e76432c7f241bfa2a2089b77bbc7769ad4180aa4ab9bf59
-SIZE (gitlab-org-gitlab-ce-1d9280e16514e01f02674591634befb8f765e858_GL0.tar.gz) = 50696311
+TIMESTAMP = 1548955245
+SHA256 (gitlab-org-gitlab-ce-3424476b4c9f17c11b969ab00e9be80f8c635c02_GL0.tar.gz) = 11e013799559e5de994bc262c212eb5e204cc8de4cebc0bdbb9c50b5ad1c0653
+SIZE (gitlab-org-gitlab-ce-3424476b4c9f17c11b969ab00e9be80f8c635c02_GL0.tar.gz) = 50712875
diff --git a/www/gitlab-ce/pkg-plist b/www/gitlab-ce/pkg-plist
index 6f1887b222a2..742b3a1242e4 100644
--- a/www/gitlab-ce/pkg-plist
+++ b/www/gitlab-ce/pkg-plist
@@ -3715,7 +3715,6 @@
 %%WWWDIR%%/app/helpers/environments_helper.rb
 %%WWWDIR%%/app/helpers/events_helper.rb
 %%WWWDIR%%/app/helpers/explore_helper.rb
-%%WWWDIR%%/app/helpers/external_wiki_helper.rb
 %%WWWDIR%%/app/helpers/favicon_helper.rb
 %%WWWDIR%%/app/helpers/form_helper.rb
 %%WWWDIR%%/app/helpers/git_helper.rb
@@ -4069,6 +4068,7 @@
 %%WWWDIR%%/app/models/label_priority.rb
 %%WWWDIR%%/app/models/legacy_diff_discussion.rb
 %%WWWDIR%%/app/models/legacy_diff_note.rb
+%%WWWDIR%%/app/models/lfs_download_object.rb
 %%WWWDIR%%/app/models/lfs_file_lock.rb
 %%WWWDIR%%/app/models/lfs_object.rb
 %%WWWDIR%%/app/models/lfs_objects_project.rb
@@ -4265,9 +4265,11 @@
 %%WWWDIR%%/app/presenters/ci/build_runner_presenter.rb
 %%WWWDIR%%/app/presenters/ci/group_variable_presenter.rb
 %%WWWDIR%%/app/presenters/ci/pipeline_presenter.rb
+%%WWWDIR%%/app/presenters/ci/trigger_presenter.rb
 %%WWWDIR%%/app/presenters/ci/variable_presenter.rb
 %%WWWDIR%%/app/presenters/clusterable_presenter.rb
 %%WWWDIR%%/app/presenters/clusters/cluster_presenter.rb
+%%WWWDIR%%/app/presenters/commit_presenter.rb
 %%WWWDIR%%/app/presenters/commit_status_presenter.rb
 %%WWWDIR%%/app/presenters/conversational_development_index/metric_presenter.rb
 %%WWWDIR%%/app/presenters/generic_commit_status_presenter.rb
@@ -4637,6 +4639,7 @@
 %%WWWDIR%%/app/services/projects/hashed_storage/migrate_repository_service.rb
 %%WWWDIR%%/app/services/projects/hashed_storage_migration_service.rb
 %%WWWDIR%%/app/services/projects/housekeeping_service.rb
+%%WWWDIR%%/app/services/projects/import_error_filter.rb
 %%WWWDIR%%/app/services/projects/import_export/export_service.rb
 %%WWWDIR%%/app/services/projects/import_service.rb
 %%WWWDIR%%/app/services/projects/lfs_pointers/lfs_download_link_list_service.rb
@@ -7577,6 +7580,7 @@
 %%WWWDIR%%/db/post_migrate/20181123042307_drop_site_statistics.rb
 %%WWWDIR%%/db/post_migrate/20181130102132_backfill_hashed_project_repositories.rb
 %%WWWDIR%%/db/post_migrate/20181204154019_populate_mr_metrics_with_events_data.rb
+%%WWWDIR%%/db/post_migrate/20181219130552_update_project_import_visibility_level.rb
 %%WWWDIR%%/db/post_migrate/20181219145520_migrate_cluster_configure_worker_sidekiq_queue.rb
 @(git,,) %%WWWDIR%%/db/schema.rb
 %%WWWDIR%%/db/seeds.rb
@@ -9333,6 +9337,7 @@
 %%WWWDIR%%/lib/api/helpers/members_helpers.rb
 %%WWWDIR%%/lib/api/helpers/notes_helpers.rb
 %%WWWDIR%%/lib/api/helpers/pagination.rb
+%%WWWDIR%%/lib/api/helpers/presentable.rb
 %%WWWDIR%%/lib/api/helpers/project_snapshots_helpers.rb
 %%WWWDIR%%/lib/api/helpers/projects_helpers.rb
 %%WWWDIR%%/lib/api/helpers/related_resources_helpers.rb
@@ -10579,6 +10584,9 @@
 %%WWWDIR%%/lib/rspec_flaky/flaky_examples_collection.rb
 %%WWWDIR%%/lib/rspec_flaky/listener.rb
 %%WWWDIR%%/lib/rspec_flaky/report.rb
+%%WWWDIR%%/lib/safe_zip/entry.rb
+%%WWWDIR%%/lib/safe_zip/extract.rb
+%%WWWDIR%%/lib/safe_zip/extract_params.rb
 %%WWWDIR%%/lib/sentry/client.rb
 %%WWWDIR%%/lib/serializers/json.rb
 %%WWWDIR%%/lib/static_model.rb
@@ -12221,12 +12229,18 @@
 %%WWWDIR%%/spec/fixtures/pages_empty.tar.gz
 %%WWWDIR%%/spec/fixtures/pages_empty.zip
 %%WWWDIR%%/spec/fixtures/pages_empty.zip.meta
+%%WWWDIR%%/spec/fixtures/pages_non_writeable.zip
 %%WWWDIR%%/spec/fixtures/patchfiles/0001-A-commit-from-a-patch.patch
 %%WWWDIR%%/spec/fixtures/patchfiles/0001-This-does-not-apply-to-the-feature-branch.patch
 %%WWWDIR%%/spec/fixtures/project_export.tar.gz
 %%WWWDIR%%/spec/fixtures/project_services/campfire/rooms.json
 %%WWWDIR%%/spec/fixtures/project_services/campfire/rooms2.json
 %%WWWDIR%%/spec/fixtures/rails_sample.jpg
+%%WWWDIR%%/spec/fixtures/safe_zip/invalid-symlink-does-not-exist.zip
+%%WWWDIR%%/spec/fixtures/safe_zip/invalid-symlinks-outside.zip
+%%WWWDIR%%/spec/fixtures/safe_zip/valid-non-writeable.zip
+%%WWWDIR%%/spec/fixtures/safe_zip/valid-simple.zip
+%%WWWDIR%%/spec/fixtures/safe_zip/valid-symlinks-first.zip
 %%WWWDIR%%/spec/fixtures/sanitized.svg
 %%WWWDIR%%/spec/fixtures/security-reports/deprecated/gl-dependency-scanning-report.json
 %%WWWDIR%%/spec/fixtures/security-reports/deprecated/gl-sast-report.json
@@ -13704,6 +13718,7 @@
 %%WWWDIR%%/spec/lib/gitlab/import_export/repo_saver_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/import_export/safe_model_attributes.yml
 %%WWWDIR%%/spec/lib/gitlab/import_export/saver_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/import_export/shared_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/import_export/uploads_manager_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/import_export/uploads_restorer_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/import_export/uploads_saver_spec.rb
@@ -13941,6 +13956,9 @@
 %%WWWDIR%%/spec/lib/rspec_flaky/flaky_examples_collection_spec.rb
 %%WWWDIR%%/spec/lib/rspec_flaky/listener_spec.rb
 %%WWWDIR%%/spec/lib/rspec_flaky/report_spec.rb
+%%WWWDIR%%/spec/lib/safe_zip/entry_spec.rb
+%%WWWDIR%%/spec/lib/safe_zip/extract_params_spec.rb
+%%WWWDIR%%/spec/lib/safe_zip/extract_spec.rb
 %%WWWDIR%%/spec/lib/sentry/client_spec.rb
 %%WWWDIR%%/spec/lib/serializers/json_spec.rb
 %%WWWDIR%%/spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb
@@ -14057,6 +14075,7 @@
 %%WWWDIR%%/spec/migrations/turn_nested_groups_into_regular_groups_for_mysql_spec.rb
 %%WWWDIR%%/spec/migrations/update_legacy_diff_notes_type_for_import_spec.rb
 %%WWWDIR%%/spec/migrations/update_notes_type_for_import_spec.rb
+%%WWWDIR%%/spec/migrations/update_project_import_visibility_level_spec.rb
 %%WWWDIR%%/spec/migrations/update_retried_for_ci_build_spec.rb
 %%WWWDIR%%/spec/migrations/update_upload_paths_to_system_spec.rb
 %%WWWDIR%%/spec/models/ability_spec.rb
@@ -14240,6 +14259,7 @@
 %%WWWDIR%%/spec/models/label_priority_spec.rb
 %%WWWDIR%%/spec/models/label_spec.rb
 %%WWWDIR%%/spec/models/legacy_diff_discussion_spec.rb
+%%WWWDIR%%/spec/models/lfs_download_object_spec.rb
 %%WWWDIR%%/spec/models/lfs_file_lock_spec.rb
 %%WWWDIR%%/spec/models/lfs_object_spec.rb
 %%WWWDIR%%/spec/models/lfs_objects_project_spec.rb
@@ -14390,9 +14410,11 @@
 %%WWWDIR%%/spec/presenters/ci/build_runner_presenter_spec.rb
 %%WWWDIR%%/spec/presenters/ci/group_variable_presenter_spec.rb
 %%WWWDIR%%/spec/presenters/ci/pipeline_presenter_spec.rb
+%%WWWDIR%%/spec/presenters/ci/trigger_presenter_spec.rb
 %%WWWDIR%%/spec/presenters/ci/variable_presenter_spec.rb
 %%WWWDIR%%/spec/presenters/clusterable_presenter_spec.rb
 %%WWWDIR%%/spec/presenters/clusters/cluster_presenter_spec.rb
+%%WWWDIR%%/spec/presenters/commit_presenter_spec.rb
 %%WWWDIR%%/spec/presenters/commit_status_presenter_spec.rb
 %%WWWDIR%%/spec/presenters/conversational_development_index/metric_presenter_spec.rb
 %%WWWDIR%%/spec/presenters/group_clusterable_presenter_spec.rb
@@ -14799,6 +14821,7 @@
 %%WWWDIR%%/spec/services/projects/hashed_storage/migrate_repository_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_error_filter_spec.rb
 %%WWWDIR%%/spec/services/projects/import_export/export_service_spec.rb
 %%WWWDIR%%/spec/services/projects/import_service_spec.rb
 %%WWWDIR%%/spec/services/projects/lfs_pointers/lfs_download_link_list_service_spec.rb