diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-15 15:45:40 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-15 15:45:40 +0000 |
| commit | cc0c2d18445a9115e87594c22cb47fcb1e8e5c41 (patch) | |
| tree | a0e27c4337e3b6bfd3701fba0a98f40ade1e3eae /lib/api/entities.rb | |
| parent | 178b6014f856dbca1653961a1f8341d7d1d38d2f (diff) | |
| parent | 4ca6a719a9f961efa8e9b2a9401319cbfc6403df (diff) | |
| download | gitlab-ce-zj-remove-deprecated-ci-service.tar.gz | |
Merge branch 'master' into 'zj-remove-deprecated-ci-service'zj-remove-deprecated-ci-service
# Conflicts:
# db/schema.rb
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 2a071e649fa..3806470ac94 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -367,7 +367,7 @@ module API class CommitStatus < Grape::Entity expose :id, :sha, :ref, :status, :name, :target_url, :description, - :created_at, :started_at, :finished_at, :allow_failure + :created_at, :started_at, :finished_at, :allow_failure, :coverage expose :author, using: Entities::UserBasic end @@ -414,7 +414,7 @@ module API end class Namespace < Grape::Entity - expose :id, :name, :path, :kind + expose :id, :name, :path, :kind, :full_path end class MemberAccess < Grape::Entity |