diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 03:10:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 03:10:11 +0300 |
| commit | b5452c76b5b35884482214dbf6fe9971e0276d3b (patch) | |
| tree | 45eaee5a27650a3c63a742398054cb666838aae3 /config | |
| parent | af969ba2792f5d872f446398abcf9895573bd292 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 5 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 | ||||
| -rw-r--r-- | config/webpack.config.js | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index e16a254e256..5d217332634 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -888,6 +888,11 @@ production: &base # (default: false) auto_link_saml_user: false + # Allow users with existing accounts to sign in and auto link their account via OmniAuth + # login, without having to do a manual login first and manually add OmniAuth. Links on email. + # (default: false) + auto_link_user: false + # Set different Omniauth providers as external so that all users creating accounts # via these providers will not be able to have access to internal projects. You # will need to use the full name of the provider, like `google_oauth2` for Google. diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 9b08f1e5be4..628d9c65ce0 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -83,6 +83,7 @@ Settings.omniauth['external_providers'] = [] if Settings.omniauth['external_prov Settings.omniauth['block_auto_created_users'] = true if Settings.omniauth['block_auto_created_users'].nil? Settings.omniauth['auto_link_ldap_user'] = false if Settings.omniauth['auto_link_ldap_user'].nil? Settings.omniauth['auto_link_saml_user'] = false if Settings.omniauth['auto_link_saml_user'].nil? +Settings.omniauth['auto_link_user'] = false if Settings.omniauth['auto_link_user'].nil? Settings.omniauth['sync_profile_from_provider'] = false if Settings.omniauth['sync_profile_from_provider'].nil? Settings.omniauth['sync_profile_attributes'] = ['email'] if Settings.omniauth['sync_profile_attributes'].nil? diff --git a/config/webpack.config.js b/config/webpack.config.js index 49e865d668d..a5b5d0f987d 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -267,6 +267,8 @@ module.exports = { runtimeChunk: 'single', splitChunks: { maxInitialRequests: 20, + // In order to prevent firewalls tripping up: https://gitlab.com/gitlab-org/gitlab/-/issues/22648 + automaticNameDelimiter: '-', cacheGroups: { default: false, common: () => ({ |