diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-06 15:10:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-06 15:10:20 +0300 |
| commit | 9ad806210531e19c851a69cbcdaf9ed8bd6cb478 (patch) | |
| tree | 348438fb6eb4219841571786b0826736d1d3e016 /app/views/notify | |
| parent | 4903f95b04db58edc1931ec917d2313c916a06b2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/unknown_sign_in_email.html.haml | 5 | ||||
| -rw-r--r-- | app/views/notify/unknown_sign_in_email.text.haml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/notify/unknown_sign_in_email.html.haml b/app/views/notify/unknown_sign_in_email.html.haml index f8a0ae1352c..e252af78060 100644 --- a/app/views/notify/unknown_sign_in_email.html.haml +++ b/app/views/notify/unknown_sign_in_email.html.haml @@ -24,6 +24,11 @@ = Gitlab.config.gitlab.host %tr %td{ style: "#{default_style}border-top:1px solid #ededed;" } + = _('User') + %td{ style: "#{default_style}color:#333333;font-weight:400;width:75%;padding-left:5px;border-top:1px solid #ededed;" } + #{sanitize_name(@user.name)} (#{@user.username}) + %tr + %td{ style: "#{default_style}border-top:1px solid #ededed;" } = _('IP Address') %td{ style: "#{default_style}color:#333333;font-weight:400;width:75%;padding-left:5px;border-top:1px solid #ededed;" } %span.muted{ style: "color:#333333;text-decoration:none;" } diff --git a/app/views/notify/unknown_sign_in_email.text.haml b/app/views/notify/unknown_sign_in_email.text.haml index f3e318f0d15..fbe35c502da 100644 --- a/app/views/notify/unknown_sign_in_email.text.haml +++ b/app/views/notify/unknown_sign_in_email.text.haml @@ -1,4 +1,4 @@ -= _('Hi %{username}!') % { username: sanitize_name(@user.name) } += _('Hi %{user_name} (%{user_username})!') % { user_name: sanitize_name(@user.name), user_username: @user.username } = _('A sign-in to your account has been made from the following IP address: %{ip}') % { ip: @ip } |