diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2018-03-21 12:18:38 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2018-03-21 12:29:20 -0500 |
| commit | f340af1c591ac3bd4377930c69fd1c73b6f3ce36 (patch) | |
| tree | 9bcdfe9a01a2233e4a2b662b4e08440be16726b2 | |
| parent | 956bd6a45861dccc40591e02cf36e895a6fc4f5b (diff) | |
| download | gitlab-ce-move-email-footer-info-to-single-line.tar.gz | |
Move email footer info to a single linemove-email-footer-info-to-single-line
From
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5031#note_64372406
| -rw-r--r-- | app/views/layouts/_mailer.html.haml | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/move-email-footer-info-to-single-line.yml | 5 |
2 files changed, 8 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 diff --git a/changelogs/unreleased/move-email-footer-info-to-single-line.yml b/changelogs/unreleased/move-email-footer-info-to-single-line.yml new file mode 100644 index 00000000000..87ed5638056 --- /dev/null +++ b/changelogs/unreleased/move-email-footer-info-to-single-line.yml @@ -0,0 +1,5 @@ +--- +title: Move email footer info to a single line +merge_request: 17916 +author: +type: changed |