parent
1f49b99a5c
commit
a83262fffa
|
@ -14,6 +14,7 @@ v 8.12.0 (unreleased)
|
|||
- Filter tags by name !6121
|
||||
- Update gitlab shell secret file also when it is empty. !3774 (glensc)
|
||||
- Give project selection dropdowns responsive width, make non-wrapping.
|
||||
- Fix resolve discussion buttons endpoint path
|
||||
- Fix note form hint showing slash commands supported for commits.
|
||||
- Make push events have equal vertical spacing.
|
||||
- API: Ensure invitees are not returned in Members API.
|
||||
|
@ -189,11 +190,6 @@ v 8.11.6
|
|||
v 8.11.5
|
||||
- Optimize branch lookups and force a repository reload for Repository#find_branch. !6087
|
||||
- Fix member expiration date picker after update. !6184
|
||||
|
||||
v 8.11.5 (unreleased)
|
||||
- Optimize branch lookups and force a repository reload for Repository#find_branch
|
||||
- Fix resolve discussion buttons endpoint path
|
||||
- Fix member expiration date picker after update
|
||||
- Fix suggested colors options for new labels in the admin area. !6138
|
||||
- Optimize discussion notes resolving and unresolving
|
||||
- Fix GitLab import button
|
||||
|
|
|
@ -432,9 +432,9 @@
|
|||
var $form = $(xhr.target);
|
||||
|
||||
if ($form.attr('data-resolve-all') != null) {
|
||||
var projectPath = $form.attr('data-project-path')
|
||||
discussionId = $form.attr('data-discussion-id'),
|
||||
mergeRequestId = $form.attr('data-noteable-iid');
|
||||
var projectPath = $form.data('project-path')
|
||||
discussionId = $form.data('discussion-id'),
|
||||
mergeRequestId = $form.data('noteable-iid');
|
||||
|
||||
if (ResolveService != null) {
|
||||
ResolveService.toggleResolveForDiscussion(projectPath, mergeRequestId, discussionId);
|
||||
|
|
|
@ -24,12 +24,12 @@
|
|||
|
||||
- if note.resolvable?
|
||||
- can_resolve = can?(current_user, :resolve_note, note)
|
||||
%resolve-btn{ ":project-path" => "'#{project_path(note.project)}'",
|
||||
":discussion-id" => "'#{note.discussion_id}'",
|
||||
%resolve-btn{ "project-path" => "#{project_path(note.project)}",
|
||||
"discussion-id" => "#{note.discussion_id}",
|
||||
":note-id" => note.id,
|
||||
":resolved" => note.resolved?,
|
||||
":can-resolve" => can_resolve,
|
||||
":resolved-by" => "'#{note.resolved_by.try(:name)}'",
|
||||
"resolved-by" => "#{note.resolved_by.try(:name)}",
|
||||
"v-show" => "#{can_resolve || note.resolved?}",
|
||||
"inline-template" => true,
|
||||
"v-ref:note_#{note.id}" => true }
|
||||
|
|
Loading…
Reference in New Issue