diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-03-01 17:33:13 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-15 18:22:02 +0100 |
| commit | 54ec7e959900493b6e9174bf4dfe09ed0afd1e46 (patch) | |
| tree | 22b79458e9d5ad2aa8ccf7ae00935c9a14aae33c /app/views/layouts/notify.html.haml | |
| parent | 0444fa560acd07255960284f19b1de6499cd5910 (diff) | |
| download | gitlab-ce-54ec7e959900493b6e9174bf4dfe09ed0afd1e46.tar.gz | |
Improving the original label-subscribing implementation
1. Make the "subscribed" text in Issuable sidebar reflect the labels
subscription status
2. Current user mut be logged-in to toggle issue/MR/label subscription
Diffstat (limited to 'app/views/layouts/notify.html.haml')
| -rw-r--r-- | app/views/layouts/notify.html.haml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml index 325c68c69dc..37b4d562966 100644 --- a/app/views/layouts/notify.html.haml +++ b/app/views/layouts/notify.html.haml @@ -42,12 +42,15 @@ - else #{link_to "View it on GitLab", @target_url}. %br - -# Don't link the host is the line below, one link in the email is easier to quickly click than two. + -# Don't link the host in the line below, one link in the email is easier to quickly click than two. You're receiving this email because of your account on #{Gitlab.config.gitlab.host}. If you'd like to receive fewer emails, you can - - if @sent_notification && @sent_notification.unsubscribable? - = link_to "unsubscribe", unsubscribe_sent_notification_url(@sent_notification) - from this thread or - adjust your notification settings. + - if @labels_url + adjust your #{link_to 'label subscriptions', @labels_url}. + - else + - if @sent_notification && @sent_notification.unsubscribable? + = link_to "unsubscribe", unsubscribe_sent_notification_url(@sent_notification) + from this thread or + adjust your notification settings. = email_action @target_url |