diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-07 09:26:48 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-07 09:26:48 +0000 |
| commit | 563ea34692a18d82d9d1bc481002f19b8a407508 (patch) | |
| tree | 6aa991974f140b42534e06abe18e4e5287afc49a /lib/api/entities.rb | |
| parent | 7adddf49965a1808e7a3a0d1a70b08172c74a762 (diff) | |
| parent | 2e311d9d1aac58bbd9c7d6c97c7cbcccf2715347 (diff) | |
| download | gitlab-ce-563ea34692a18d82d9d1bc481002f19b8a407508.tar.gz | |
Merge branch '12910-snippets-description' into 'master'
Support descriptions for snippets
Closes #31894
See merge request !11071
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 ded5c65e303..a836df3dc81 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -226,7 +226,7 @@ module API end class ProjectSnippet < Grape::Entity - expose :id, :title, :file_name + expose :id, :title, :file_name, :description expose :author, using: Entities::UserBasic expose :updated_at, :created_at @@ -236,7 +236,7 @@ module API end class PersonalSnippet < Grape::Entity - expose :id, :title, :file_name + expose :id, :title, :file_name, :description expose :author, using: Entities::UserBasic expose :updated_at, :created_at |