Security update to version 11.5.1.

Approved by:	mentors (implicit)
MFH:		2018Q4
Security:	8a4aba2d-f33e-11e8-9416-001b217b3468

3 files changed, 21 insertions, 9 deletions

diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index aedd3ca6c05e..b2781b683328 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-ce
-PORTVERSION=	11.5.0
+PORTVERSION=	11.5.1
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -17,9 +17,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 # for the options
 MY_DEPENDS=	git>=2.16.2:devel/git \
 	gitlab-shell>=8.4.1:devel/gitlab-shell \
-	gitlab-workhorse>=7.1.0:www/gitlab-workhorse \
+	gitlab-workhorse>=7.1.3:www/gitlab-workhorse \
 	gitaly>=0.129.0:devel/gitaly \
-	gitlab-pages>=1.3.0:www/gitlab-pages \
+	gitlab-pages>=1.3.1:www/gitlab-pages \
 	redis>=3.2.12:databases/redis \
 	npm>=4.3.0:www/npm \
 	yarn>=0.17.0:www/yarn \
@@ -215,7 +215,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=	b7b1e8ecdf7407c8ec887a88a92c4a3eb57299d2
+GL_COMMIT=	c90ae59a8becf9d31ff7f67fe13c671ba683bb27
 
 USERS=	git
 GROUPS=	git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index 8eefe6e8ce14..61a3703bab49 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542966190
-SHA256 (gitlab-org-gitlab-ce-b7b1e8ecdf7407c8ec887a88a92c4a3eb57299d2_GL0.tar.gz) = 82f849054a67a9370cdbbd362dcafbe319df69bd313e404c9788ac52c9c9e55b
-SIZE (gitlab-org-gitlab-ce-b7b1e8ecdf7407c8ec887a88a92c4a3eb57299d2_GL0.tar.gz) = 50398862
+TIMESTAMP = 1543446561
+SHA256 (gitlab-org-gitlab-ce-c90ae59a8becf9d31ff7f67fe13c671ba683bb27_GL0.tar.gz) = 4d86b6812b3035defa73d01021c4ef33b11a26dd9992bad58d5a068d382185f0
+SIZE (gitlab-org-gitlab-ce-c90ae59a8becf9d31ff7f67fe13c671ba683bb27_GL0.tar.gz) = 50402783
diff --git a/www/gitlab-ce/pkg-plist b/www/gitlab-ce/pkg-plist
index 2f01bff038de..13237514db56 100644
--- a/www/gitlab-ce/pkg-plist
+++ b/www/gitlab-ce/pkg-plist
@@ -3336,6 +3336,7 @@
 %%WWWDIR%%/app/controllers/concerns/send_file_upload.rb
 %%WWWDIR%%/app/controllers/concerns/sends_blob.rb
 %%WWWDIR%%/app/controllers/concerns/service_params.rb
+%%WWWDIR%%/app/controllers/concerns/sessionless_authentication.rb
 %%WWWDIR%%/app/controllers/concerns/snippets_actions.rb
 %%WWWDIR%%/app/controllers/concerns/spammable_actions.rb
 %%WWWDIR%%/app/controllers/concerns/todos_actions.rb
@@ -4807,6 +4808,8 @@
 %%WWWDIR%%/app/views/devise/mailer/_confirmation_instructions_secondary.text.erb
 %%WWWDIR%%/app/views/devise/mailer/confirmation_instructions.html.haml
 %%WWWDIR%%/app/views/devise/mailer/confirmation_instructions.text.erb
+%%WWWDIR%%/app/views/devise/mailer/email_changed.html.haml
+%%WWWDIR%%/app/views/devise/mailer/email_changed.text.erb
 %%WWWDIR%%/app/views/devise/mailer/password_change.html.haml
 %%WWWDIR%%/app/views/devise/mailer/password_change.text.erb
 %%WWWDIR%%/app/views/devise/mailer/reset_password_instructions.html.haml
@@ -5098,8 +5101,8 @@
 %%WWWDIR%%/app/views/notify/note_merge_request_email.text.erb
 %%WWWDIR%%/app/views/notify/note_personal_snippet_email.html.haml
 %%WWWDIR%%/app/views/notify/note_personal_snippet_email.text.erb
-%%WWWDIR%%/app/views/notify/note_snippet_email.html.haml
-%%WWWDIR%%/app/views/notify/note_snippet_email.text.erb
+%%WWWDIR%%/app/views/notify/note_project_snippet_email.html.haml
+%%WWWDIR%%/app/views/notify/note_project_snippet_email.text.erb
 %%WWWDIR%%/app/views/notify/pages_domain_disabled_email.html.haml
 %%WWWDIR%%/app/views/notify/pages_domain_disabled_email.text.haml
 %%WWWDIR%%/app/views/notify/pages_domain_enabled_email.html.haml
@@ -7182,6 +7185,7 @@
 %%WWWDIR%%/db/migrate/20181026143227_migrate_snippets_access_level_default_value.rb
 %%WWWDIR%%/db/migrate/20181101144347_add_index_for_stuck_mr_query.rb
 %%WWWDIR%%/db/migrate/20181106135939_add_index_to_deployments.rb
+%%WWWDIR%%/db/migrate/20181108091549_cleanup_environments_external_url.rb
 %%WWWDIR%%/db/migrate/gpg_keys_limits_to_mysql.rb
 %%WWWDIR%%/db/migrate/limits_ci_build_trace_chunks_raw_data_for_mysql.rb
 %%WWWDIR%%/db/migrate/limits_to_mysql.rb
@@ -7357,6 +7361,7 @@
 %%WWWDIR%%/db/post_migrate/20181013005024_remove_koding_from_application_settings.rb
 %%WWWDIR%%/db/post_migrate/20181014121030_enqueue_redact_links.rb
 %%WWWDIR%%/db/post_migrate/20181022173835_enqueue_populate_cluster_kubernetes_namespace.rb
+%%WWWDIR%%/db/post_migrate/20181026091631_migrate_forbidden_redirect_uris.rb
 %%WWWDIR%%/db/post_migrate/20181030135124_fill_empty_finished_at_in_deployments.rb
 %%WWWDIR%%/db/post_migrate/20181105201455_steal_fill_store_upload.rb
 %%WWWDIR%%/db/post_migrate/20181107054254_remove_restricted_todos_again.rb
@@ -9031,6 +9036,7 @@
 %%WWWDIR%%/doc/workflow/workflow.md
 %%WWWDIR%%/docker-compose.yml
 %%WWWDIR%%/docker/README.md
+%%WWWDIR%%/ee/changelogs/unreleased/sh-fix-issue-54189.yml
 %%WWWDIR%%/fixtures/emojis/aliases.json
 %%WWWDIR%%/fixtures/emojis/digests.json
 %%WWWDIR%%/fixtures/emojis/emoji-unicode-version-map.json
@@ -10772,6 +10778,7 @@
 %%WWWDIR%%/spec/controllers/dashboard/groups_controller_spec.rb
 %%WWWDIR%%/spec/controllers/dashboard/labels_controller_spec.rb
 %%WWWDIR%%/spec/controllers/dashboard/milestones_controller_spec.rb
+%%WWWDIR%%/spec/controllers/dashboard/projects_controller_spec.rb
 %%WWWDIR%%/spec/controllers/dashboard/todos_controller_spec.rb
 %%WWWDIR%%/spec/controllers/dashboard_controller_spec.rb
 %%WWWDIR%%/spec/controllers/explore/groups_controller_spec.rb
@@ -11278,6 +11285,7 @@
 %%WWWDIR%%/spec/features/milestones/user_creates_milestone_spec.rb
 %%WWWDIR%%/spec/features/milestones/user_deletes_milestone_spec.rb
 %%WWWDIR%%/spec/features/milestones/user_edits_milestone_spec.rb
+%%WWWDIR%%/spec/features/milestones/user_promotes_milestone_spec.rb
 %%WWWDIR%%/spec/features/milestones/user_views_milestone_spec.rb
 %%WWWDIR%%/spec/features/milestones/user_views_milestones_spec.rb
 %%WWWDIR%%/spec/features/oauth_login_spec.rb
@@ -13489,6 +13497,7 @@
 %%WWWDIR%%/spec/migrations/clean_up_for_members_spec.rb
 %%WWWDIR%%/spec/migrations/clean_upload_symlinks_spec.rb
 %%WWWDIR%%/spec/migrations/cleanup_build_stage_migration_spec.rb
+%%WWWDIR%%/spec/migrations/cleanup_environments_external_url_spec.rb
 %%WWWDIR%%/spec/migrations/cleanup_move_system_upload_folder_symlink_spec.rb
 %%WWWDIR%%/spec/migrations/cleanup_namespaceless_pending_delete_projects_spec.rb
 %%WWWDIR%%/spec/migrations/cleanup_nonexisting_namespace_pending_delete_projects_spec.rb
@@ -13509,6 +13518,7 @@
 %%WWWDIR%%/spec/migrations/issues_moved_to_id_foreign_key_spec.rb
 %%WWWDIR%%/spec/migrations/migrate_build_stage_reference_again_spec.rb
 %%WWWDIR%%/spec/migrations/migrate_create_trace_artifact_sidekiq_queue_spec.rb
+%%WWWDIR%%/spec/migrations/migrate_forbidden_redirect_uris_spec.rb
 %%WWWDIR%%/spec/migrations/migrate_gcp_clusters_to_new_clusters_architectures_spec.rb
 %%WWWDIR%%/spec/migrations/migrate_import_attributes_data_from_projects_to_project_mirror_data_spec.rb
 %%WWWDIR%%/spec/migrations/migrate_issues_to_ghost_user_spec.rb
@@ -14372,6 +14382,7 @@
 %%WWWDIR%%/spec/support/controllers/githubish_import_controller_shared_context.rb
 %%WWWDIR%%/spec/support/controllers/githubish_import_controller_shared_examples.rb
 %%WWWDIR%%/spec/support/controllers/ldap_omniauth_callbacks_controller_shared_context.rb
+%%WWWDIR%%/spec/support/controllers/sessionless_auth_controller_shared_examples.rb
 %%WWWDIR%%/spec/support/cycle_analytics_helpers/test_generation.rb
 %%WWWDIR%%/spec/support/db_cleaner.rb
 %%WWWDIR%%/spec/support/features/discussion_comments_shared_example.rb
@@ -14536,6 +14547,7 @@
 %%WWWDIR%%/spec/support/shared_contexts/json_response_shared_context.rb
 %%WWWDIR%%/spec/support/shared_contexts/merge_requests_allowing_collaboration.rb
 %%WWWDIR%%/spec/support/shared_contexts/services_shared_context.rb
+%%WWWDIR%%/spec/support/shared_contexts/url_shared_context.rb
 %%WWWDIR%%/spec/support/shared_examples/chat_slash_commands_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/ci_trace_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/common_system_notes_examples.rb