diff options
| author | Go MAEDA <maeda@farend.jp> | 2020-04-30 09:00:06 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2020-04-30 09:00:06 +0000 |
| commit | 94c62816a52c13e1cdb91aab6f26c4798897b4a5 (patch) | |
| tree | 6df427ce135df8554fc6ded0b95bf2860caaaa2b /config | |
| parent | d94226dd4ccc5757a94f3fe1542cdd736831fd48 (diff) | |
| download | redmine-94c62816a52c13e1cdb91aab6f26c4798897b4a5.tar.gz redmine-94c62816a52c13e1cdb91aab6f26c4798897b4a5.zip | |
Allowed/Disallowed email domains settings to restrict users' email addresses (#3369).
Patch by Yuichi HARADA and Go MAEDA.
git-svn-id: http://svn.redmine.org/redmine/trunk@19735 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 2 | ||||
| -rw-r--r-- | config/settings.yml | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index cd9b9a766..f1abf88ed 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -479,6 +479,8 @@ en: setting_force_default_language_for_loggedin: Force default language for logged-in users setting_link_copied_issue: Link issues on copy setting_max_additional_emails: Maximum number of additional email addresses + setting_email_domains_allowed: Allowed email domains + setting_email_domains_denied: Disallowed email domains setting_search_results_per_page: Search results per page setting_attachment_extensions_allowed: Allowed extensions setting_attachment_extensions_denied: Disallowed extensions diff --git a/config/settings.yml b/config/settings.yml index 5aaaaac28..7c0912232 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -53,6 +53,10 @@ password_max_age: max_additional_emails: format: int default: 5 +email_domains_allowed: + default: +email_domains_denied: + default: # Maximum lifetime of user sessions in minutes session_lifetime: format: int |