diff options
| author | James Lopez <james@jameslopez.es> | 2016-07-01 14:03:37 +0300 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-07-19 10:59:54 +0300 |
| commit | bf1ea8c6fe34abe7bde8913f6a6d88eff4d77fc3 (patch) | |
| tree | 7efe0308af51ae90f2eb5044757614bb9828b2f9 /lib/gitlab/import_export/import_export.yml | |
| parent | 78cd5b8d0e0a69d7b1681bf98b17ccb7a22dde5f (diff) | |
Squashed - fix encoding issue
WIP - trying to replicate UTF-8 error
fix spec
fixing encoding issue and another spec, to do with MR diffs
fix issue and spec failure
Add changelog and bumped up I/E version
fix spec based on feedback - omitted target project
Diffstat (limited to 'lib/gitlab/import_export/import_export.yml')
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index 05f4ad527ac..15afe8174a4 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -53,7 +53,11 @@ included_attributes: excluded_attributes: snippets: - :expired_at + merge_request_diff: + - :st_diffs methods: statuses: - - :type
\ No newline at end of file + - :type + merge_request_diff: + - :utf8_st_diffs
\ No newline at end of file |