summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-02-06 12:19:00 +0000
committerFilipa Lacerda <filipa@gitlab.com>2019-02-06 12:19:00 +0000
commit5bfa8e2f5e03849645570ba8c2dbfcc5c834f1b1 (patch)
treeb8a5f15796039af3f659f74cbc131c401818be9b /config
parent3b4c4095bbda55ae0b4d32f9b17c0e4f03c5ceed (diff)
parentd279cc94088fddd6f6bb2847e456bbf68ae616ea (diff)
downloadgitlab-ce-5bfa8e2f5e03849645570ba8c2dbfcc5c834f1b1.tar.gz
Merge branch '43681-display-last-activity-and-created-at-datetimes-for-users-in-admin-users' into 'master'
Resolve "Display last activity and created at datetimes for users" Closes #43681 See merge request gitlab-org/gitlab-ce!24181
Diffstat (limited to 'config')
-rw-r--r--config/locales/de.yml1
-rw-r--r--config/locales/en.yml1
-rw-r--r--config/locales/es.yml1
3 files changed, 3 insertions, 0 deletions
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 38c3711c6c7..554e9913faa 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -43,6 +43,7 @@ de:
default: "%d.%m.%Y"
long: "%e. %B %Y"
short: "%e. %b"
+ admin: "%e %b, %Y"
month_names:
-
- Januar
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0a43a1d9a6b..e8dbc033a7c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -55,6 +55,7 @@ en:
default: "%Y-%m-%d"
long: "%B %d, %Y"
short: "%b %d"
+ admin: "%e %b, %Y"
month_names:
-
- January
diff --git a/config/locales/es.yml b/config/locales/es.yml
index fdc52b4ae11..78c07583933 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -42,6 +42,7 @@ es:
default: "%d/%m/%Y"
long: "%d de %B de %Y"
short: "%d de %b"
+ admin: "%e %b, %Y"
month_names:
-
- enero