diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
| commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
| tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /config/locales | |
| parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/doorkeeper.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml index 7c8dc2d0a32..8469b72c312 100644 --- a/config/locales/doorkeeper.en.yml +++ b/config/locales/doorkeeper.en.yml @@ -81,6 +81,8 @@ en: Grants read-write access to repositories on private projects using Git-over-HTTP (not using the API). read_registry: Grants read-only access to container registry images on private projects. + write_registry: + Grants write access to container registry images on private projects. openid: Grants permission to authenticate with GitLab using OpenID Connect. Also gives read-only access to the user's profile and group memberships. sudo: diff --git a/config/locales/en.yml b/config/locales/en.yml index c95232ae540..ed0552ab452 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -272,4 +272,5 @@ en: long: "%B %d, %Y %H:%M" short: "%d %b %H:%M" timeago_tooltip: "%b %-d, %Y %-l:%M%P" + with_timezone: "%Y-%m-%d %H:%M:%S %z" pm: pm |