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
1322bd78
Commit
1322bd78
authored
Dec 15, 2015
by
Douwe Maan
Committed by
Robert Speicher
Dec 15, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'rs-issue-4032' into 'master'
Fix note polling Closes #4032 See merge request !2084
parent
19daba8a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
app/controllers/projects/notes_controller.rb
app/controllers/projects/notes_controller.rb
+2
-1
No files found.
app/controllers/projects/notes_controller.rb
View file @
1322bd78
...
...
@@ -13,7 +13,8 @@ class Projects::NotesController < Projects::ApplicationController
@notes
.
each
do
|
note
|
notes_json
[
:notes
]
<<
{
id:
note
.
id
,
html:
note_to_html
(
note
)
html:
note_to_html
(
note
),
valid:
note
.
valid?
}
end
...
...
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