diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-02-06 11:22:21 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-02-06 11:22:21 +0300 |
| commit | 591380a3f1bf1b5220f176f082af297831a1886e (patch) | |
| tree | 4bcf4ccf030d6df6ac5a784009fd33d2ca7a12fa /lib/gitlab | |
| parent | d0187de202d94fa445a28c347b7a54dbf09a22a8 (diff) | |
| parent | f9e41d0d851ae0ab1d67df63d0309fdce97517e1 (diff) | |
Merge branch '52568-external-mr-diffs' into 'master'
Allow merge request diffs to be placed into an object store
Closes #52568
See merge request gitlab-org/gitlab-ce!24276
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index add7ee58da6..099677a791c 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -130,9 +130,14 @@ excluded_attributes: snippets: - :expired_at merge_request_diff: + - :external_diff + - :stored_externally + - :external_diff_store - :st_diffs merge_request_diff_files: - :diff + - :external_diff_offset + - :external_diff_size issues: - :milestone_id merge_requests: |