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
Léo-Paul Géneau
gitlab-ce
Commits
1b117e7f
Commit
1b117e7f
authored
Aug 02, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'api_project_events_target_iid' into 'master'
Expose target_iid in Events API See merge request !13247
parents
92bfd5ba
24704acc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
changelogs/unreleased/13247-api_project_events_target_iid.yml
...gelogs/unreleased/13247-api_project_events_target_iid.yml
+4
-0
doc/api/events.md
doc/api/events.md
+2
-0
lib/api/entities.rb
lib/api/entities.rb
+1
-1
No files found.
changelogs/unreleased/13247-api_project_events_target_iid.yml
0 → 100644
View file @
1b117e7f
---
title
:
Expose target_iid in Events API
merge_request
:
13247
author
:
sue445
doc/api/events.md
View file @
1b117e7f
...
...
@@ -302,6 +302,7 @@ Example response:
"project_id"
:
1
,
"action_name"
:
"opened"
,
"target_id"
:
160
,
"target_iid"
:
160
,
"target_type"
:
"Issue"
,
"author_id"
:
25
,
"data"
:
null
,
...
...
@@ -322,6 +323,7 @@ Example response:
"project_id"
:
1
,
"action_name"
:
"opened"
,
"target_id"
:
159
,
"target_iid"
:
159
,
"target_type"
:
"Issue"
,
"author_id"
:
21
,
"data"
:
null
,
...
...
lib/api/entities.rb
View file @
1b117e7f
...
...
@@ -496,7 +496,7 @@ module API
class
Event
<
Grape
::
Entity
expose
:title
,
:project_id
,
:action_name
expose
:target_id
,
:target_type
,
:author_id
expose
:target_id
,
:target_
iid
,
:target_
type
,
:author_id
expose
:data
,
:target_title
expose
:created_at
expose
:note
,
using:
Entities
::
Note
,
if:
->
(
event
,
options
)
{
event
.
note?
}
...
...
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