diff options
| author | Lanre Adelowo <adelowomailbox@gmail.com> | 2018-08-07 11:01:06 +0100 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2018-08-07 13:01:06 +0300 |
| commit | 59b10e66f757441e8c74532f30740bf4a96e9ac1 (patch) | |
| tree | c303efa6ce5bc98bfcec6a912fe181c72f6f0ead /options/locale/locale_en-US.ini | |
| parent | c7a6ee5c0bd8dcceac76dcb2100e81395d57560a (diff) | |
| download | gitea-59b10e66f757441e8c74532f30740bf4a96e9ac1.tar.gz gitea-59b10e66f757441e8c74532f30740bf4a96e9ac1.zip | |
An inactive user shouldn't be able to be added as a collaborator (#4535)
* an inactive user shouldn't be able to be a collaborator
* use translated error message
* add active user check when adding a new collaborator via the api
* fix translation text
* added collaborator test
* improvee testcases
Diffstat (limited to 'options/locale/locale_en-US.ini')
| -rw-r--r-- | options/locale/locale_en-US.ini | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index bd13288b46..85178d3417 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1025,7 +1025,8 @@ settings.transfer_succeed = The repository has been transferred. settings.confirm_delete = Delete Repository settings.add_collaborator = Add Collaborator settings.add_collaborator_success = The collaborator has been added. -settings.add_collaborator_duplicate =The collaborator is already added to this repository. +settings.add_collaborator_inactive_user = Can not add an inactive user as a collaborator. +settings.add_collaborator_duplicate = The collaborator is already added to this repository. settings.delete_collaborator = Remove settings.collaborator_deletion = Remove Collaborator settings.collaborator_deletion_desc = Removing a collaborator will revoke their access to this repository. Continue? |