diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2016-11-18 21:19:04 -0500 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-11-18 21:19:04 -0500 |
| commit | 452d1d0824f44664484c35a2acc7c008c8167196 (patch) | |
| tree | 4fc0203967136f3a3f1d93fd42ae565f3afffc0a /app/serializers/merge_request_entity.rb | |
| parent | aea8baed3093c513560e9ac5ac0c5c99508d3001 (diff) | |
| download | gitlab-ce-452d1d0824f44664484c35a2acc7c008c8167196.tar.gz | |
Backport some changes done from Time Tracking feature in EE.ee-870-backport
Diffstat (limited to 'app/serializers/merge_request_entity.rb')
| -rw-r--r-- | app/serializers/merge_request_entity.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/app/serializers/merge_request_entity.rb b/app/serializers/merge_request_entity.rb new file mode 100644 index 00000000000..7445298c714 --- /dev/null +++ b/app/serializers/merge_request_entity.rb @@ -0,0 +1,14 @@ +class MergeRequestEntity < IssuableEntity + expose :in_progress_merge_commit_sha + expose :locked_at + expose :merge_commit_sha + expose :merge_error + expose :merge_params + expose :merge_status + expose :merge_user_id + expose :merge_when_build_succeeds + expose :source_branch + expose :source_project_id + expose :target_branch + expose :target_project_id +end |