diff options
| author | Jarka Košanová <jarka@gitlab.com> | 2019-07-16 12:13:31 +0200 |
|---|---|---|
| committer | Jarka Košanová <jarka@gitlab.com> | 2019-09-13 08:27:33 +0200 |
| commit | dd38e2899ca5d9a41d84aeb42dd0160ab0718555 (patch) | |
| tree | 5a3bd429fc70e0a3dfa1cfcd22319e93aec708d1 /lib/api/entities.rb | |
| parent | 25cb337cf12438169f1b14bc5dace8a06a7356e3 (diff) | |
| download | gitlab-ce-63082-issue-trackers-data.tar.gz | |
Extract issue trackers data fields63082-issue-trackers-data
- move issue trackers properties to
a separated table
- keep backwards compatibily and still be able to read
from properties
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 312c8d5b548..102ea393672 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1044,7 +1044,12 @@ module API expose :job_events # Expose serialized properties expose :properties do |service, options| - service.properties.slice(*service.api_field_names) + # TODO: Simplify as part of https://gitlab.com/gitlab-org/gitlab-ce/issues/63084 + if service.data_fields_present? + service.data_fields.as_json.slice(*service.api_field_names) + else + service.properties.slice(*service.api_field_names) + end end end |