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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
d6b7599d
Commit
d6b7599d
authored
Jul 27, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed failing JS
parent
5a0cd0e9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/assets/javascripts/notes.js
app/assets/javascripts/notes.js
+2
-2
No files found.
app/assets/javascripts/notes.js
View file @
d6b7599d
...
@@ -403,7 +403,7 @@
...
@@ -403,7 +403,7 @@
projectPath
=
$form
.
attr
(
'
data-project-path
'
)
projectPath
=
$form
.
attr
(
'
data-project-path
'
)
discussionId
=
$form
.
attr
(
'
data-discussion-id
'
),
discussionId
=
$form
.
attr
(
'
data-discussion-id
'
),
mergeRequestId
=
$
(
'
input[name="noteable_iid"]
'
,
$form
).
val
(),
mergeRequestId
=
$
(
'
input[name="noteable_iid"]
'
,
$form
).
val
(),
namespace
=
`
${
namespacePath
}
/
${
projectPath
}
`
;
namespace
=
namespacePath
+
'
/
'
+
projectPath
;
if
(
ResolveService
!=
null
)
{
if
(
ResolveService
!=
null
)
{
ResolveService
.
toggleResolveForDiscussion
(
namespace
,
mergeRequestId
,
discussionId
);
ResolveService
.
toggleResolveForDiscussion
(
namespace
,
mergeRequestId
,
discussionId
);
...
@@ -606,7 +606,7 @@
...
@@ -606,7 +606,7 @@
}
else
if
(
DiffNotesApp
)
{
}
else
if
(
DiffNotesApp
)
{
var
$commentBtn
=
form
.
find
(
'
resolve-comment-btn
'
);
var
$commentBtn
=
form
.
find
(
'
resolve-comment-btn
'
);
$commentBtn
$commentBtn
.
attr
(
'
:discussion-id
'
,
`'
${
dataHolder
.
data
(
"
discussionId
"
)}
'`
);
.
attr
(
'
:discussion-id
'
,
dataHolder
.
data
(
'
discussionId
'
)
);
DiffNotesApp
.
$compile
(
$commentBtn
.
get
(
0
));
DiffNotesApp
.
$compile
(
$commentBtn
.
get
(
0
));
}
}
...
...
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