diff options
author | Jarka Košanová <jarka@gitlab.com> | 2019-09-10 14:47:06 +0200 |
---|---|---|
committer | Jarka Košanová <jarka@gitlab.com> | 2019-09-10 14:47:06 +0200 |
commit | 78056d049dd47a60bd63b927f32310a391b54760 (patch) | |
tree | 3c54311bb785ade7d3c5f3f6b4af7f6e5ab00f48 /lib/api | |
parent | 34bb2453f3e692429ce30cd4b832670d497055de (diff) | |
download | gitlab-ce-63082-jira-service-data.tar.gz |
Use data_fields for issue trackers63082-jira-service-data
- create and update data only in data fields tables
- keep backwards compatibility for reading
from properties
- simlify factories
Diffstat (limited to 'lib/api')
-rw-r--r-- | lib/api/entities.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 312c8d5b548..cc45679dd0e 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1044,7 +1044,11 @@ module API expose :job_events # Expose serialized properties expose :properties do |service, options| - service.properties.slice(*service.api_field_names) + if service.properties.present? + service.properties.slice(*service.api_field_names) + else + service.data_fields.as_json.slice(*service.api_field_names) + end end end |