diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-26 09:38:09 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-26 09:38:09 +0000 |
| commit | adf50202d773cad57f57b6fd8bb0454216fbe877 (patch) | |
| tree | b62eca449e9aa1e97ec44166935d2e2254cec42f /lib | |
| parent | bb8a41b2cbfcc05f49ca15466d54220be1e20cd5 (diff) | |
| parent | d70944d911ec49bc623982655d11e6bfcadf79b8 (diff) | |
| download | gitlab-ce-adf50202d773cad57f57b6fd8bb0454216fbe877.tar.gz | |
Merge branch 'fix/import-services' into 'master'
Fixes issue with rails reserved keyword type exporting/importing services.
The attribute `type`in services was being ignored by Import/Export. Added `type` as a method call in the export, as `type` gets ignored invoking `to_json`, manually adding this as a method in `import_export.yml` solves the problem.
On a different note, I found assigning a title directly to `CustomIssueTrackerService` didn't play very well with `prop_accessor`:
```ruby
> CustomIssueTrackerService.new(title: 'asdf')
NoMethodError: undefined method `[]=' for nil:NilClass
> CustomIssueTrackerService.new(title: nil)
NoMethodError: undefined method `[]=' for nil:NilClass
```
This was also causing the Import/Export to failed... So I added a custom setter that fixed the problem.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22461
See merge request !6499
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index 88803d76623..1c42acab9c1 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -73,5 +73,7 @@ excluded_attributes: methods: statuses: - :type + services: + - :type merge_request_diff: - :utf8_st_diffs |