Fixed close merge request not hiding

app/assets/javascripts/notes.js

@@ -600,6 +600,7 @@
       form.find("#note_noteable_type").val(dataHolder.data("noteableType"));
       form.find("#note_noteable_id").val(dataHolder.data("noteableId"));
       form.find('.js-note-discard').show().removeClass('js-note-discard').addClass('js-close-discussion-note-form').text(form.find('.js-close-discussion-note-form').data('cancel-text'));
+      form.find('.js-note-target-close').remove();
 
       if (canResolve === 'false') {
         form.find('resolve-comment-btn').remove();

app/models/discussion.rb

@@ -76,7 +76,7 @@ class Discussion
     return false unless resolvable?
 
     current_user == self.noteable.author ||
-      can?(current_user, :push_code, self.project)
+      current_user.can?(:push_code, self.project)
   end
 
   def resolve!(current_user)