diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-07-15 15:46:59 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-07-15 15:46:59 +0000 |
| commit | 96277bb9d61b5aaf5c2edc388c5eabfc743478f0 (patch) | |
| tree | 97b8dd4c4b8f6f61ebca38c7e0253c35ec311007 /lib | |
| parent | ca56311d0e8acde5417ec890c74cb684cf96af92 (diff) | |
| parent | ec512406857aecabc577b3fc70ec321982dd65a8 (diff) | |
| download | gitlab-ce-96277bb9d61b5aaf5c2edc388c5eabfc743478f0.tar.gz | |
Merge branch 'georgekoltsov/63955-fix-import-with-source-branch-deleted' into 'master'
Always return MR diff_refs if importing
See merge request gitlab-org/gitlab-ce!30630
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/import_export/attribute_cleaner.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/attribute_cleaner.rb b/lib/gitlab/import_export/attribute_cleaner.rb index c28a1674018..b2fe9592c06 100644 --- a/lib/gitlab/import_export/attribute_cleaner.rb +++ b/lib/gitlab/import_export/attribute_cleaner.rb @@ -3,7 +3,7 @@ module Gitlab module ImportExport class AttributeCleaner - ALLOWED_REFERENCES = RelationFactory::PROJECT_REFERENCES + RelationFactory::USER_REFERENCES + ['group_id'] + ALLOWED_REFERENCES = RelationFactory::PROJECT_REFERENCES + RelationFactory::USER_REFERENCES + %w[group_id commit_id] PROHIBITED_REFERENCES = Regexp.union(/\Acached_markdown_version\Z/, /_id\Z/, /_html\Z/).freeze def self.clean(*args) |