kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixed close merge request not hiding

This commit is contained in:
Phil Hughes 2016-07-27 10:17:05 +01:00
parent d6b7599df4
commit b53ccd112d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/notes.js
View File

@ -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();

2
app/models/discussion.rb
View File

@ -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)