Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a83262ff
Commit
a83262ff
authored
Sep 21, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed props to use strings
Use jQuery
parent
1f49b99a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
11 deletions
+7
-11
CHANGELOG
CHANGELOG
+1
-5
app/assets/javascripts/notes.js
app/assets/javascripts/notes.js
+3
-3
app/views/projects/notes/_note.html.haml
app/views/projects/notes/_note.html.haml
+3
-3
No files found.
CHANGELOG
View file @
a83262ff
...
...
@@ -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
...
...
app/assets/javascripts/notes.js
View file @
a83262ff
...
...
@@ -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
);
...
...
app/views/projects/notes/_note.html.haml
View file @
a83262ff
...
...
@@ -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
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment