diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-21 09:28:47 -0600 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 17:44:14 +0100 |
| commit | 874413cf701870a0fc1051f7c0a5fc4b4f884657 (patch) | |
| tree | 6cb2917f6a72fc918c8f28d884597f36fe0de34b /app/views | |
| parent | 79889a6aa3dc878d196d0f2f445ab6b10ef10c74 (diff) | |
| download | gitlab-ce-874413cf701870a0fc1051f7c0a5fc4b4f884657.tar.gz | |
Fix specs
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/discussions/_notes.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/notify.html.haml | 4 | ||||
| -rw-r--r-- | app/views/notify/new_mention_in_issue_email.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notify/new_mention_in_merge_request_email.html.haml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml index c8fcc37d1ab..d7b2abf1269 100644 --- a/app/views/discussions/_notes.html.haml +++ b/app/views/discussions/_notes.html.haml @@ -11,7 +11,7 @@ = link_to_reply_discussion(discussion, line_type) = render "discussions/resolve_all", discussion: discussion - + .btn-group.discussion-actions = render "discussions/new_issue_for_discussion", discussion: discussion, merge_request: discussion.noteable = render "discussions/jump_to_next", discussion: discussion diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml index 76268c1b705..40bf45cece7 100644 --- a/app/views/layouts/notify.html.haml +++ b/app/views/layouts/notify.html.haml @@ -25,8 +25,8 @@ - if @labels_url adjust your #{link_to 'label subscriptions', @labels_url}. - else - - if @sent_notification_url - = link_to "unsubscribe", @sent_notification_url + - if @unsubscribe_url + = link_to "unsubscribe", @unsubscribe_url from this thread or adjust your notification settings. diff --git a/app/views/notify/new_mention_in_issue_email.html.haml b/app/views/notify/new_mention_in_issue_email.html.haml index d7c22219285..6b45ac265f7 100644 --- a/app/views/notify/new_mention_in_issue_email.html.haml +++ b/app/views/notify/new_mention_in_issue_email.html.haml @@ -1,4 +1,4 @@ %p You have been mentioned in an issue. -= render template: 'new_issue_email' += render template: 'notify/new_issue_email' diff --git a/app/views/notify/new_mention_in_merge_request_email.html.haml b/app/views/notify/new_mention_in_merge_request_email.html.haml index 07d8c301988..b061f9c106e 100644 --- a/app/views/notify/new_mention_in_merge_request_email.html.haml +++ b/app/views/notify/new_mention_in_merge_request_email.html.haml @@ -1,4 +1,4 @@ %p You have been mentioned in Merge Request #{@merge_request.to_reference} -= render template: 'new_merge_request_email' += render template: 'notify/new_merge_request_email' |