From 045c0f9554a99c80d0a127540da168e272a9f977 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 6 Jan 2020 12:07:56 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/gitlab.yml.example | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'config/gitlab.yml.example') diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 5ac9b7ee6e5..6613afdfed2 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -150,6 +150,9 @@ production: &base ## Impersonation settings impersonation_enabled: true + ## Disable jQuery and CSS animations + # disable_animations: true + ## Reply by email # Allow users to comment on issues and merge requests by replying to notification emails. # For documentation on how to set this up, see http://doc.gitlab.com/ce/administration/reply_by_email.html @@ -807,7 +810,7 @@ production: &base # CAUTION! # This allows users to login with the specified providers without two factor. Define the allowed providers # using an array, e.g. ["twitter", 'google_oauth2'], or as true/false to allow all providers or none. - # This option should only be configured for providers which already have two factor. + # This option should only be configured for providers which already have two factor. # This configration dose not apply to SAML. # (default: false) allow_bypass_two_factor: ["twitter", 'google_oauth2'] -- cgit v1.2.3