diff options
Diffstat (limited to 'app/views/discussions')
5 files changed, 5 insertions, 46 deletions
diff --git a/app/views/discussions/_diff_with_notes.html.haml b/app/views/discussions/_diff_with_notes.html.haml index 8a3c841de0b..b34b6f09662 100644 --- a/app/views/discussions/_diff_with_notes.html.haml +++ b/app/views/discussions/_diff_with_notes.html.haml @@ -29,7 +29,7 @@ %td.line_content.js-success-lazy-load .js-code-placeholder %td.js-error-lazy-load-diff.hidden.diff-loading-error-block - - button = button_tag(_("Try again"), class: "btn-link btn-link-retry btn-no-padding js-toggle-lazy-diff-retry-button") + - button = button_tag(_("Try again"), class: "btn-link gl-button btn-link-retry btn-no-padding js-toggle-lazy-diff-retry-button") = _("Unable to load the diff. %{button_try_again}").html_safe % { button_try_again: button} = render "discussions/diff_discussion", discussions: [discussion], expanded: true - else diff --git a/app/views/discussions/_jump_to_next.html.haml b/app/views/discussions/_jump_to_next.html.haml deleted file mode 100644 index 3db509f24a5..00000000000 --- a/app/views/discussions/_jump_to_next.html.haml +++ /dev/null @@ -1,9 +0,0 @@ -- discussion = local_assigns.fetch(:discussion, nil) -- if current_user - %jump-to-discussion{ "inline-template" => true, ":discussion-id" => "'#{discussion.try(:id)}'" } - .btn-group{ role: "group", "v-show" => "!allResolved", "v-if" => "showButton" } - %button.btn.btn-default.discussion-next-btn.has-tooltip{ "@click" => "jumpToNextUnresolvedDiscussion", - ":title" => "buttonText", - ":aria-label" => "buttonText", - data: { container: "body" } } - = custom_icon("next_discussion") diff --git a/app/views/discussions/_new_issue_for_all_discussions.html.haml b/app/views/discussions/_new_issue_for_all_discussions.html.haml deleted file mode 100644 index 50dd5864195..00000000000 --- a/app/views/discussions/_new_issue_for_all_discussions.html.haml +++ /dev/null @@ -1,8 +0,0 @@ -- if merge_request.discussions_can_be_resolved_by?(current_user) && can?(current_user, :create_issue, @project) - .btn-group{ role: "group", "v-if" => "unresolvedDiscussionCount > 0" } - = link_to custom_icon('icon_mr_issue'), - new_project_issue_path(@project, merge_request_to_resolve_discussions_of: merge_request.iid), - title: 'Resolve all discussions in new issue', - aria: { label: 'Resolve all discussions in new issue' }, - data: { container: 'body' }, - class: 'new-issue-for-discussion btn btn-default discussion-create-issue-btn has-tooltip' diff --git a/app/views/discussions/_new_issue_for_discussion.html.haml b/app/views/discussions/_new_issue_for_discussion.html.haml deleted file mode 100644 index 49d5378d62e..00000000000 --- a/app/views/discussions/_new_issue_for_discussion.html.haml +++ /dev/null @@ -1,10 +0,0 @@ -- if discussion.can_resolve?(current_user) && can?(current_user, :create_issue, @project) - %new-issue-for-discussion-btn{ ":discussion-id" => "'#{discussion.id}'", - "inline-template" => true } - .btn-group{ role: "group", "v-if" => "showButton" } - = link_to custom_icon('icon_mr_issue'), - new_project_issue_path(@project, merge_request_to_resolve_discussions_of: merge_request.iid, discussion_to_resolve: discussion.id), - title: 'Resolve this thread in a new issue', - aria: { label: 'Resolve this thread in a new issue' }, - data: { container: 'body' }, - class: 'new-issue-for-discussion btn btn-default discussion-create-issue-btn has-tooltip' diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml index 0a5541c3e82..7db318f83b1 100644 --- a/app/views/discussions/_notes.html.haml +++ b/app/views/discussions/_notes.html.haml @@ -9,9 +9,9 @@ -# to the first note position when we click on a badge diff discussion %ul.notes{ id: "discussion_#{discussion.id}", data: { discussion_id: discussion.id, position: discussion.notes[0].position.to_json } } - if discussion.try(:on_image?) && show_toggle - %button.diff-notes-collapse.js-diff-notes-toggle{ type: 'button' } + %button.gl-button.diff-notes-collapse.js-diff-notes-toggle{ type: 'button' } = sprite_icon('collapse', css_class: 'collapse-icon') - %button.btn-transparent.badge.badge-pill.js-diff-notes-toggle{ type: 'button' } + %button.gl-button.btn-transparent.badge.badge-pill.js-diff-notes-toggle{ type: 'button' } = badge_counter = render partial: "shared/notes/note", collection: discussion.notes, as: :note, locals: { badge_counter: badge_counter, show_image_comment_badge: show_image_comment_badge } @@ -21,22 +21,8 @@ - if can_create_note? %a.user-avatar-link.d-none.d-sm-block{ href: user_path(current_user) } = image_tag avatar_icon_for_user(current_user), alt: current_user.to_reference, class: 'avatar s40' - - if discussion.potentially_resolvable? - - line_type = local_assigns.fetch(:line_type, nil) - - .discussion-with-resolve-btn - .btn-group.discussion-with-resolve-btn{ role: "group" } - .btn-group{ role: "group" } - = 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 - - else - .discussion-with-resolve-btn - = link_to_reply_discussion(discussion) + .discussion-with-resolve-btn + = link_to_reply_discussion(discussion) - elsif !current_user .disabled-comment.text-center Please |