Skip to content
Snippets Groups Projects
Commit b53ccd11 authored by Phil Hughes's avatar Phil Hughes
Browse files

Fixed close merge request not hiding

parent d6b7599d
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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();
Loading
Loading
Loading
Loading
@@ -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)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment