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
961cb285
Commit
961cb285
authored
Nov 29, 2012
by
Nihad Abbasov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
API: restore broken merge request commenting
parent
c946bf88
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
15 deletions
+20
-15
lib/api/entities.rb
lib/api/entities.rb
+5
-0
lib/api/merge_requests.rb
lib/api/merge_requests.rb
+15
-15
No files found.
lib/api/entities.rb
View file @
961cb285
...
@@ -75,5 +75,10 @@ module Gitlab
...
@@ -75,5 +75,10 @@ module Gitlab
expose
:author
,
using:
Entities
::
UserBasic
expose
:author
,
using:
Entities
::
UserBasic
expose
:updated_at
,
:created_at
expose
:updated_at
,
:created_at
end
end
class
MRNote
<
Grape
::
Entity
expose
:note
expose
:author
,
using:
Entities
::
UserBasic
end
end
end
end
end
lib/api/merge_requests.rb
View file @
961cb285
...
@@ -107,7 +107,7 @@ module Gitlab
...
@@ -107,7 +107,7 @@ module Gitlab
note
.
author
=
current_user
note
.
author
=
current_user
if
note
.
save
if
note
.
save
present
note
,
with:
Entities
::
Note
present
note
,
with:
Entities
::
MR
Note
else
else
not_found!
not_found!
end
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