diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-11-03 11:52:33 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-11-03 11:52:33 +0000 |
| commit | d7c50b4a95b5530ae0e2f5249cfd9a419dd940c6 (patch) | |
| tree | ebecae4f45d5c5e01bcf39807b87e90e353cecf6 | |
| parent | fe610ff576fa5bac0b875309f137b471e7fe7e50 (diff) | |
| parent | 9b251bd1cc1ed551aad9bc67ca2743b8e2666c6e (diff) | |
| download | gitlab-ce-d7c50b4a95b5530ae0e2f5249cfd9a419dd940c6.tar.gz | |
Merge branch 'api-events-username' into 'master'
Expose author username in project events API
Fixes gitlab/gitlabhq#1476
See merge request !1236
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | doc/api/projects.md | 3 | ||||
| -rw-r--r-- | lib/api/entities.rb | 6 | ||||
| -rw-r--r-- | spec/requests/api/projects_spec.rb | 1 |
4 files changed, 12 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index cc287b67063..5dab8c864e7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,8 @@ v 7.5.0 - 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 diff --git a/doc/api/projects.md b/doc/api/projects.md index dfe3502b6e4..0055e2e476f 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -186,6 +186,7 @@ Parameters: "target_id": 830, "target_type": "Issue", "author_id": 1, + "author_username": "john", "data": null, "target_title": "Public project search field" }, @@ -196,6 +197,7 @@ Parameters: "target_id": null, "target_type": null, "author_id": 1, + "author_username": "john", "data": { "before": "50d4420237a9de7be1304607147aec22e4a14af7", "after": "c5feabde2d8cd023215af4d2ceeb7a64839fc428", @@ -231,6 +233,7 @@ Parameters: "target_id": 840, "target_type": "Issue", "author_id": 1, + "author_username": "john", "data": null, "target_title": "Finish & merge Code search PR" } diff --git a/lib/api/entities.rb b/lib/api/entities.rb index d19caf5b23a..4e7b1c91c4e 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -183,6 +183,12 @@ module API 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 diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index ba7ec7b2be9..cb7a2705573 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -339,6 +339,7 @@ describe API::API, api: true do 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 |