diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-03-22 12:40:29 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-03-22 12:40:29 +0300 |
| commit | 4718f22f5751f8d50bd7897ff4a967ccc5625c80 (patch) | |
| tree | c7e89c855c93773883df484a7680e6725e80d4cf /app | |
| parent | 9b4b79fffe3b93c2479c31873073d6a7f93baf5a (diff) | |
| parent | f340af1c591ac3bd4377930c69fd1c73b6f3ce36 (diff) | |
Merge branch 'move-email-footer-info-to-single-line' into 'master'
Move email footer info to a single line
See merge request gitlab-org/gitlab-ce!17916
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/layouts/_mailer.html.haml | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/app/views/layouts/_mailer.html.haml b/app/views/layouts/_mailer.html.haml index b50537438a9..ddc1cdb24b5 100644 --- a/app/views/layouts/_mailer.html.haml +++ b/app/views/layouts/_mailer.html.haml @@ -67,12 +67,8 @@ %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;" } %img{ alt: "GitLab", height: "33", src: image_url('mailers/gitlab_footer_logo.gif'), style: "display:block;margin:0 auto 1em;", width: "90" }/ %div - %a{ href: profile_notifications_url, style: "color:#3777b0;text-decoration:none;" } Manage all notifications - · - %a{ href: help_url, style: "color:#3777b0;text-decoration:none;" } Help - %div - You're receiving this email because of your account on - = succeed "." do - %a{ href: root_url, style: "color:#3777b0;text-decoration:none;" }= Gitlab.config.gitlab.host + - manage_notifications_link = link_to(_("Manage all notifications"), profile_notifications_url, style: "color:#3777b0;text-decoration:none;") + - help_link = link_to(_("Help"), help_url, style: "color:#3777b0;text-decoration:none;") + = _("You're receiving this email because of your account on %{host}. %{manage_notifications_link} · %{help_link}").html_safe % { host: Gitlab.config.gitlab.host, manage_notifications_link: manage_notifications_link, help_link: help_link } = yield :additional_footer |