diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-22 09:47:54 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-22 09:47:54 +0300 |
| commit | 4423b299b73e2b96b980b848fab5cf374361572b (patch) | |
| tree | 8f2c7b12b3c267efda53918f67210225fac017ff /app/serializers | |
| parent | 0b5947849a32991904f8cbc5e4612d2438b97e0b (diff) | |
| parent | 36f4710301926bb853b35d9b14a60e03b42def34 (diff) | |
Merge branch 'master' into 22643-manual-job-page
* master: (68 commits)
Last push event widget width for fixed layout
Added 'admin' persona
Docs: move article Artifactory + GL to subject-related folder
Mention GitLab Pages when changing username
Consolidate the docs when changing a repo path
Add docs for automatic redirects when renaming namespaces
move "Transfer an existing project into a group" to project docs
Do not show Vue pagination if only one page
Resolve "Decouple multi-file editor from file list"
Update Ruby version to 2.3.6
Skip projects filter on merge requests search
Fall back to the `MergeRequestWidgetEntity`
LDAP extern_uids are not normalized when updated via API
organise content by subject
Restore missing language code in datetime_utility.js
Add support for defining explicit dependencies to QA factories
Document mounting volumes with Docker-in-Docker
add missing word to pawel-reduce_cardinality_of_prometheus_metrics.yml
Use seconds where possible, and convert to milliseconds for Influxdb consumption
update dispatcher to allow for dynamic imports until webpack plugin is updated
...
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/merge_request_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/merge_request_serializer.rb b/app/serializers/merge_request_serializer.rb index 52eb30d688a..caf193bdae3 100644 --- a/app/serializers/merge_request_serializer.rb +++ b/app/serializers/merge_request_serializer.rb @@ -7,7 +7,7 @@ class MergeRequestSerializer < BaseSerializer case opts[:serializer] when 'basic', 'sidebar' MergeRequestBasicEntity - when 'widget' + else # It's 'widget' MergeRequestWidgetEntity end |