diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-08-20 12:19:19 -0700 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-08-20 12:19:19 -0700 |
commit | 3d51a6d4351c6a15c92762f5710a967374d0c59b (patch) | |
tree | 10c5e87e0add51ef0bdcc9be42ac0176907a080c /lib/api/entities.rb | |
parent | 8ec5fb138dde9937814ac138352177399d3e776d (diff) | |
parent | 8819007c83fdf1ac642836640a37cc541f6eddc6 (diff) | |
download | gitlab-ce-3d51a6d4351c6a15c92762f5710a967374d0c59b.tar.gz |
Merge branch 'master' into reply-by-email
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r-- | lib/api/entities.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 09d231af41b..1f9dd6bc152 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -221,6 +221,7 @@ module API expose(:line) { |note| note.diff_new_line } expose(:line_type) { |note| note.diff_line_type } expose :author, using: Entities::UserBasic + expose :created_at end class Event < Grape::Entity |