diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 15:07:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 15:07:56 +0300 |
| commit | 045c0f9554a99c80d0a127540da168e272a9f977 (patch) | |
| tree | 2c4b0d10c9432e68b6c1aca2097e663ba18b48ec /config | |
| parent | 669c24d9276db9a73bbcea40aeab98273aae9e5e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 2 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb index 1897244eb6d..da674b2b944 100644 --- a/config/application.rb +++ b/config/application.rb @@ -166,7 +166,7 @@ module Gitlab config.assets.precompile << "page_bundles/xterm.css" config.assets.precompile << "performance_bar.css" config.assets.precompile << "lib/ace.js" - config.assets.precompile << "test.css" + config.assets.precompile << "disable_animations.css" config.assets.precompile << "snippets.css" config.assets.precompile << "locale/**/app.js" config.assets.precompile << "emoji_sprites.css" 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'] |