Fix resolve discussion tooltip

app/assets/javascripts/main.js

@@ -136,7 +136,8 @@ document.addEventListener('DOMContentLoaded', () => {
   });
 
   // Initialize tooltips
-  $('.has-tooltip, [data-toggle="tooltip"]').tooltip({
+  $body.tooltip({
+    selector: '.has-tooltip, [data-toggle="tooltip"]',
     placement(tip, el) {
       return $(el).data('placement') || 'bottom';
     },

app/views/discussions/_notes.html.haml

@@ -22,7 +22,7 @@
       - if discussion.potentially_resolvable?
         - line_type = local_assigns.fetch(:line_type, nil)
 
-        .btn-group.d-flex.discussion-with-resolve-btn{ role: "group" }
+        .btn-group.discussion-with-resolve-btn{ role: "group" }
           .btn-group{ role: "group" }
             = link_to_reply_discussion(discussion, line_type)