summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorReuben Pereira <rpereira@gitlab.com>2019-07-31 06:54:03 +0000
committerJames Lopez <james@gitlab.com>2019-07-31 06:54:03 +0000
commit5c7f2853dc5a8eca874108a0217a115090f29e9b (patch)
tree15e22a546814fa495fbb00ce1fdfbf2efa97a1d2 /locale
parent67ffe3ced0a704d78f528e5dc8ea4243e5e4a47f (diff)
downloadgitlab-ce-5c7f2853dc5a8eca874108a0217a115090f29e9b.tar.gz
Allow blank but not nil in validations
- The most common use case for qualified_domain_validator currently is to allow blank ([]) but not allow nil. Modify the qualified_domain_validator to support this use case.
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot6
1 files changed, 3 insertions, 3 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index feae99fb95a..878ee5bc344 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -9238,7 +9238,7 @@ msgstr ""
msgid "Requests Profiles"
msgstr ""
-msgid "Requests to these domain(s)/address(es) on the local network will be allowed when local requests from hooks and services are disabled. IP ranges such as 1:0:0:0:0:0:0:0/124 or 127.0.0.0/28 are supported. Domain wildcards are not supported currently. Use comma, semicolon, or newline to separate multiple entries. The whitelist can hold a maximum of 4000 entries. Domains should use IDNA encoding. Ex: domain.com, 192.168.1.1, 127.0.0.0/28."
+msgid "Requests to these domain(s)/address(es) on the local network will be allowed when local requests from hooks and services are not allowed. IP ranges such as 1:0:0:0:0:0:0:0/124 or 127.0.0.0/28 are supported. Domain wildcards are not supported currently. Use comma, semicolon, or newline to separate multiple entries. The whitelist can hold a maximum of 1000 entries. Domains should use IDNA encoding. Ex: example.com, 192.168.1.1, 127.0.0.0/28, xn--itlab-j1a.com."
msgstr ""
msgid "Require all users in this group to setup Two-factor authentication"
@@ -13137,10 +13137,10 @@ msgstr ""
msgid "encrypted: needs to be a :required, :optional or :migrating!"
msgstr ""
-msgid "entries cannot be blank"
+msgid "entries cannot be larger than 255 characters"
msgstr ""
-msgid "entries cannot be larger than 255 characters"
+msgid "entries cannot be nil"
msgstr ""
msgid "entries cannot contain HTML tags"