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
30f655c3
Commit
30f655c3
authored
Jul 26, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed JS bugs in note.js merge
parent
2f5ee5ed
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 @
30f655c3
...
...
@@ -507,7 +507,7 @@
notes
=
note
.
closest
(
"
.notes
"
);
if
(
DiffNotesApp
!=
null
)
{
ref
DiffNotesApp
.
$refs
[
''
+
noteId
+
''
];
ref
=
DiffNotesApp
.
$refs
[
''
+
noteId
+
''
];
if
(
ref
)
{
ref
.
$destroy
(
true
);
...
...
@@ -763,7 +763,7 @@
return
this
.
notesCountBadge
.
text
(
parseInt
(
this
.
notesCountBadge
.
text
())
+
updateCount
);
};
Notes
.
pro
r
otype
.
resolveDiscussion
=
function
()
{
Notes
.
pro
t
otype
.
resolveDiscussion
=
function
()
{
var
$this
=
$
(
this
),
discussionId
=
$this
.
attr
(
'
data-discussion-id
'
);
...
...
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