diff options
| author | Phil Hughes <me@iamphill.com> | 2016-08-01 10:06:31 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-08-01 10:06:31 +0100 |
| commit | c51cbc1f2f3b590c4f38198dd886c4e372b4e476 (patch) | |
| tree | 5c4b1e26c68b810fa46bf42d200bf2f30e452f10 /app/views/discussions | |
| parent | db8c4bce381a137d7afea99d39ffd4d5e70b5580 (diff) | |
| download | gitlab-ce-c51cbc1f2f3b590c4f38198dd886c4e372b4e476.tar.gz | |
Updated issues with jump tp button
Fixed styling bugs
Diffstat (limited to 'app/views/discussions')
| -rw-r--r-- | app/views/discussions/_notes.html.haml | 20 | ||||
| -rw-r--r-- | app/views/discussions/_resolve_all.html.haml | 19 |
2 files changed, 20 insertions, 19 deletions
diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml index c5bf454ccfe..fbe470bed2c 100644 --- a/app/views/discussions/_notes.html.haml +++ b/app/views/discussions/_notes.html.haml @@ -1,15 +1,15 @@ %ul.notes{ data: { discussion_id: discussion.id } } = render partial: "projects/notes/note", collection: discussion.notes, as: :note -.discussion-reply-holder - - if discussion.diff_discussion? - - line_type = local_assigns.fetch(:line_type, nil) +- if current_user + .discussion-reply-holder + - if discussion.diff_discussion? + - line_type = local_assigns.fetch(:line_type, nil) - .btn-group-justified.discussion-with-resolve-btn{ role: "group" } - .btn-group{ role: "group" } - = link_to_reply_discussion(discussion, line_type) - .btn-group{ role: "group" } + .btn-group-justified.discussion-with-resolve-btn{ role: "group" } + .btn-group{ role: "group" } + = link_to_reply_discussion(discussion, line_type) = render "discussions/resolve_all", discussion: discussion - = render "discussions/jump_to_next", discussion: discussion - - else - = link_to_reply_discussion(discussion) + = render "discussions/jump_to_next", discussion: discussion + - else + = link_to_reply_discussion(discussion) diff --git a/app/views/discussions/_resolve_all.html.haml b/app/views/discussions/_resolve_all.html.haml index 9eef367716f..5d751c60d2a 100644 --- a/app/views/discussions/_resolve_all.html.haml +++ b/app/views/discussions/_resolve_all.html.haml @@ -1,10 +1,11 @@ - if discussion.can_resolve?(current_user) - %resolve-discussion-btn{ ":namespace-path" => "'#{discussion.project.namespace.path}'", - ":project-path" => "'#{discussion.project.path}'", - ":discussion-id" => "'#{discussion.id}'", - ":merge-request-id" => "#{discussion.noteable.iid}", - "inline-template" => true, - "v-cloak" => true } - %button.btn.btn-default{ type: "button", "@click" => "resolve", ":disabled" => "loading" } - = icon("spinner spin", "v-show" => "loading") - {{ buttonText }} + .btn-group{ role: "group" } + %resolve-discussion-btn{ ":namespace-path" => "'#{discussion.project.namespace.path}'", + ":project-path" => "'#{discussion.project.path}'", + ":discussion-id" => "'#{discussion.id}'", + ":merge-request-id" => "#{discussion.noteable.iid}", + "inline-template" => true, + "v-cloak" => true } + %button.btn.btn-default{ type: "button", "@click" => "resolve", ":disabled" => "loading" } + = icon("spinner spin", "v-show" => "loading") + {{ buttonText }} |