summaryrefslogtreecommitdiff
path: root/lib/gitlab/import_export
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2019-02-15 12:47:29 +0000
committerLin Jen-Shin <godfat@godfat.org>2019-02-15 12:47:29 +0000
commitab06c9b654c5f26fbe9e3fce22a54f7944ee4dab (patch)
tree667658495fbead19c7035c7f317db4182d3c9c41 /lib/gitlab/import_export
parentd02ca097312245e13ba9e1301964342a4327859a (diff)
parent80a7aa99058c74eaae4466eac53f83a31246a387 (diff)
downloadgitlab-ce-ab06c9b654c5f26fbe9e3fce22a54f7944ee4dab.tar.gz
Merge branch 'remove-ignored-columns' into 'master'
Remove two ignored columns See merge request gitlab-org/gitlab-ce!25250
Diffstat (limited to 'lib/gitlab/import_export')
-rw-r--r--lib/gitlab/import_export/import_export.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml
index 099677a791c..7f8c6d56627 100644
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -133,7 +133,6 @@ excluded_attributes:
- :external_diff
- :stored_externally
- :external_diff_store
- - :st_diffs
merge_request_diff_files:
- :diff
- :external_diff_offset