diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-02-02 11:54:35 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-02-02 11:54:35 +0800 |
| commit | 54fca95160389fe7993df5d82635b83804833fee (patch) | |
| tree | 8552f29a7bfbf24af39a5d6a3f8b110c1695f7de /app/serializers | |
| parent | eb242fc865c032f6408f3b68700da9b840b416dd (diff) | |
| parent | 40a824357c700280f3d2f8e2cda2fabc65af7f69 (diff) | |
| download | gitlab-ce-fix-git-hooks-when-creating-file.tar.gz | |
Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creating-filefix-git-hooks-when-creating-file
* upstream/master: (190 commits)
Remove unnecessary returns / unset variables from the CoffeeScript -> JS conversion.
update spec
Change the reply shortcut to focus the field even without a selection.
use destroy_all
Remove settings cog from within admin scroll tabs; keep links centered
add changelog
remove old project members from project
add spec replicating validation error
Fix small typo on new branch button spec
Improve styling of the new issue message
Don't capitalize environment name in show page
Abillity to promote project labels to group labels
Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles
Update and pin the `jwt` gem to ~> 1.5.6
refactor merge request build service
Update index.md
Clarify that Auto Deploy requires a public project.
19164 Add settings dropdown to mobile screens
cop for gem fetched from a git source
Add CHANGELOG entry
...
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/base_serializer.rb | 1 | ||||
| -rw-r--r-- | app/serializers/pipeline_serializer.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/serializers/base_serializer.rb b/app/serializers/base_serializer.rb index de9a181db90..311ee9c96be 100644 --- a/app/serializers/base_serializer.rb +++ b/app/serializers/base_serializer.rb @@ -6,6 +6,7 @@ class BaseSerializer def represent(resource, opts = {}) self.class.entity_class .represent(resource, opts.merge(request: @request)) + .as_json end def self.entity(entity_class) diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb index cfa86cc2553..b2de6c5832e 100644 --- a/app/serializers/pipeline_serializer.rb +++ b/app/serializers/pipeline_serializer.rb @@ -1,9 +1,10 @@ class PipelineSerializer < BaseSerializer - entity PipelineEntity class InvalidResourceError < StandardError; end include API::Helpers::Pagination Struct.new('Pagination', :request, :response) + entity PipelineEntity + def represent(resource, opts = {}) if paginated? raise InvalidResourceError unless resource.respond_to?(:page) |