diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-10 21:29:10 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-10 21:29:10 +0300 |
| commit | 0d881c7873c6fad4e65e61cbb12e2bb405517c50 (patch) | |
| tree | a548c557f6c8bcb653df917e4f9e007cabcfc4a4 | |
| parent | 705e43bf04729d3f479d1c1dd08dae0c1746b8f2 (diff) | |
| parent | d570d0a2804990fc59126828616011d310392d64 (diff) | |
| download | gitlab-ce-0d881c7873c6fad4e65e61cbb12e2bb405517c50.tar.gz | |
Merge pull request #9114 from dreis2211/dreis2211-patch-1
Include creator_id in project info of API
| -rw-r--r-- | doc/api/projects.md | 3 | ||||
| -rw-r--r-- | lib/api/entities.rb | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/doc/api/projects.md b/doc/api/projects.md index 55d525fef66..971fe96fb8e 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -63,6 +63,7 @@ Parameters: "snippets_enabled": false, "created_at": "2013-09-30T13: 46: 02Z", "last_activity_at": "2013-09-30T13: 46: 02Z", + "creator_id": 3, "namespace": { "created_at": "2013-09-30T13: 46: 02Z", "description": "", @@ -103,6 +104,7 @@ Parameters: "snippets_enabled": false, "created_at": "2013-09-30T13:46:02Z", "last_activity_at": "2013-09-30T13:46:02Z", + "creator_id": 3, "namespace": { "created_at": "2013-09-30T13:46:02Z", "description": "", @@ -190,6 +192,7 @@ Parameters: "snippets_enabled": false, "created_at": "2013-09-30T13: 46: 02Z", "last_activity_at": "2013-09-30T13: 46: 02Z", + "creator_id": 3, "namespace": { "created_at": "2013-09-30T13: 46: 02Z", "description": "", diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 51cb934616b..36332bc6514 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -54,6 +54,7 @@ module API expose :name, :name_with_namespace expose :path, :path_with_namespace expose :issues_enabled, :merge_requests_enabled, :wiki_enabled, :snippets_enabled, :created_at, :last_activity_at + expose :creator_id expose :namespace expose :forked_from_project, using: Entities::ForkedFromProject, if: lambda{ | project, options | project.forked? } expose :avatar_url |