Commit 77590856 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'api-events-username' into 'master'

Expose author username in project events API

Fixes gitlab/gitlabhq#1476

See merge request !1236
......@@ -6,6 +6,8 @@
- Add Atlassian Bamboo CI service (Drew Blessing)
- Mentioned @user will receive email even if he is not participating in issue or commit
- Tie up loose ends with annotated tags: API & UI (Sean Edge)
- Return valid json for deleting branch via API (sponsored by O'Reilly Media)
- Expose username in project events API (sponsored by O'Reilly Media)
v 7.4.2
- Fix internal snippet exposing for unauthenticated users
......
......@@ -186,6 +186,7 @@
"target_id": 830,
"target_type": "Issue",
"author_id": 1,
"author_username": "john",
"data": null,
"target_title": "Public project search field"
},
......@@ -196,6 +197,7 @@
"target_id": null,
"target_type": null,
"author_id": 1,
"author_username": "john",
"data": {
"before": "50d4420237a9de7be1304607147aec22e4a14af7",
"after": "c5feabde2d8cd023215af4d2ceeb7a64839fc428",
......@@ -231,6 +233,7 @@
"target_id": 840,
"target_type": "Issue",
"author_id": 1,
"author_username": "john",
"data": null,
"target_title": "Finish & merge Code search PR"
}
......
......@@ -183,6 +183,12 @@
expose :target_id, :target_type, :author_id
expose :data, :target_title
expose :created_at
expose :author_username do |event, options|
if event.author
event.author.username
end
end
end
class Namespace < Grape::Entity
......
......@@ -339,6 +339,7 @@
json_event['action_name'].should == 'joined'
json_event['project_id'].to_i.should == project.id
json_event['author_username'].should == user.username
end
it "should return a 404 error if not found" do
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment