summaryrefslogtreecommitdiff
path: root/app/views/discussions/_notes.html.haml
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2017-06-01 10:31:33 +0200
committerZ.J. van de Weg <git@zjvandeweg.nl>2017-06-01 10:31:33 +0200
commit00b00f1edee71d236b0cd5b796bb68f15142911f (patch)
tree471ef31c0c455abe44f04dcd7d2ba84e87f22be1 /app/views/discussions/_notes.html.haml
parentf4aa01053ed39a265ddfd9ee6e9618bd3406e59d (diff)
parentdd0f8b8ccc3b5f61e31703f7391a919b702934a5 (diff)
downloadgitlab-ce-00b00f1edee71d236b0cd5b796bb68f15142911f.tar.gz
Merge branch 'master' into zj-realtime-env-list
Diffstat (limited to 'app/views/discussions/_notes.html.haml')
-rw-r--r--app/views/discussions/_notes.html.haml14
1 files changed, 11 insertions, 3 deletions
diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml
index 7ba3f3f6c42..db5ab939948 100644
--- a/app/views/discussions/_notes.html.haml
+++ b/app/views/discussions/_notes.html.haml
@@ -1,10 +1,11 @@
.discussion-notes
%ul.notes{ data: { discussion_id: discussion.id } }
= render partial: "shared/notes/note", collection: discussion.notes, as: :note
- .flash-container
- - if current_user
- .discussion-reply-holder
+ .flash-container
+
+ .discussion-reply-holder
+ - if can_create_note?
- if discussion.potentially_resolvable?
- line_type = local_assigns.fetch(:line_type, nil)
@@ -19,3 +20,10 @@
= render "discussions/jump_to_next", discussion: discussion
- else
= link_to_reply_discussion(discussion)
+ - elsif !current_user
+ .disabled-comment.text-center
+ Please
+ = link_to "register", new_session_path(:user, redirect_to_referer: 'yes')
+ or
+ = link_to "sign in", new_session_path(:user, redirect_to_referer: 'yes')
+ to reply