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 /spec | |
| 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
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/requests/api/projects_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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 |