diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 12:09:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 12:09:06 +0300 |
| commit | 7e8278c0f46cf6058efad5afd0aef177977bd663 (patch) | |
| tree | 7ac46710921145bb782bcb208ea896e1548b168b /lib/gitlab/import_export/base_relation_factory.rb | |
| parent | bbf6581214128ae12a6ff32f66a0d03ee57a2e91 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/import_export/base_relation_factory.rb')
| -rw-r--r-- | lib/gitlab/import_export/base_relation_factory.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/base_relation_factory.rb b/lib/gitlab/import_export/base_relation_factory.rb index 562b549f6a1..d3c8802bcce 100644 --- a/lib/gitlab/import_export/base_relation_factory.rb +++ b/lib/gitlab/import_export/base_relation_factory.rb @@ -24,7 +24,8 @@ module Gitlab last_edited_by_id merge_user_id resolved_by_id - closed_by_id owner_id + closed_by_id + owner_id ].freeze TOKEN_RESET_MODELS = %i[Project Namespace Group Ci::Trigger Ci::Build Ci::Runner ProjectHook].freeze |