1 files changed, 4 insertions, 18 deletions

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