diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-21 12:54:55 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-21 12:54:55 +0000 |
| commit | 671c6d7d577d6b872bee7634c4eaf6b4da16919f (patch) | |
| tree | dd42a8956b92aefbd270f1696d30b358a48f07bd /app/serializers | |
| parent | 0be557331d8341fef473ca59e63116ef60f400e6 (diff) | |
| parent | 452d1d0824f44664484c35a2acc7c008c8167196 (diff) | |
| download | gitlab-ce-671c6d7d577d6b872bee7634c4eaf6b4da16919f.tar.gz | |
Merge branch 'ee-870-backport' into 'master'
Backport some changes done from Time Tracking feature in EE.
See merge request !7604
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/issuable_entity.rb | 16 | ||||
| -rw-r--r-- | app/serializers/issue_entity.rb | 9 | ||||
| -rw-r--r-- | app/serializers/issue_serializer.rb | 3 | ||||
| -rw-r--r-- | app/serializers/label_entity.rb | 11 | ||||
| -rw-r--r-- | app/serializers/merge_request_entity.rb | 14 | ||||
| -rw-r--r-- | app/serializers/merge_request_serializer.rb | 3 |
6 files changed, 56 insertions, 0 deletions
diff --git a/app/serializers/issuable_entity.rb b/app/serializers/issuable_entity.rb new file mode 100644 index 00000000000..17c9160cb19 --- /dev/null +++ b/app/serializers/issuable_entity.rb @@ -0,0 +1,16 @@ +class IssuableEntity < Grape::Entity + expose :id + expose :iid + expose :assignee_id + expose :author_id + expose :description + expose :lock_version + expose :milestone_id + expose :position + expose :state + expose :title + expose :updated_by_id + expose :created_at + expose :updated_at + expose :deleted_at +end diff --git a/app/serializers/issue_entity.rb b/app/serializers/issue_entity.rb new file mode 100644 index 00000000000..6429159ebe1 --- /dev/null +++ b/app/serializers/issue_entity.rb @@ -0,0 +1,9 @@ +class IssueEntity < IssuableEntity + expose :branch_name + expose :confidential + expose :due_date + expose :moved_to_id + expose :project_id + expose :milestone, using: API::Entities::Milestone + expose :labels, using: LabelEntity +end diff --git a/app/serializers/issue_serializer.rb b/app/serializers/issue_serializer.rb new file mode 100644 index 00000000000..4fff54a9126 --- /dev/null +++ b/app/serializers/issue_serializer.rb @@ -0,0 +1,3 @@ +class IssueSerializer < BaseSerializer + entity IssueEntity +end diff --git a/app/serializers/label_entity.rb b/app/serializers/label_entity.rb new file mode 100644 index 00000000000..304fd9de08f --- /dev/null +++ b/app/serializers/label_entity.rb @@ -0,0 +1,11 @@ +class LabelEntity < Grape::Entity + expose :id + expose :title + expose :color + expose :description + expose :group_id + expose :project_id + expose :template + expose :created_at + expose :updated_at +end 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 diff --git a/app/serializers/merge_request_serializer.rb b/app/serializers/merge_request_serializer.rb new file mode 100644 index 00000000000..aa6e00dfcb4 --- /dev/null +++ b/app/serializers/merge_request_serializer.rb @@ -0,0 +1,3 @@ +class MergeRequestSerializer < BaseSerializer + entity MergeRequestEntity +end |