diff options
author | James Lopez <james@jameslopez.es> | 2016-09-23 17:52:39 +0300 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-09-26 10:49:05 +0300 |
commit | a9f1e972ec12bd628e8fc85388c6ba598902ae25 (patch) | |
tree | 18589991a13efd3203baa13e3e807d38db3bbf0e /lib | |
parent | 1aca3670b0e749ea3a64849a3033c83f0c23ba31 (diff) |
Fixes issue with rails reserved keyword type exporting/importing services. Also fixed CustomIssueTrackerService title setter and added relevant specs.
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 |