diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-08-08 01:47:48 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-08-08 01:47:48 +0000 |
| commit | fd40bce9ccad94c3f8fe522a51a771335d95539f (patch) | |
| tree | 0fb76c147480326f17fb77271628c24794255572 /lib | |
| parent | 4490af8cf22416f12c8cf2e00f8b7c293be08167 (diff) | |
| parent | a0c22d1edafbd87d59dbf01acd610da97ec87912 (diff) | |
| download | gitlab-ce-fd40bce9ccad94c3f8fe522a51a771335d95539f.tar.gz | |
Merge branch '31207-clean-locked-merge-requests' into 'master'
Resolve "Store MergeWorker JID on merge request, and clean up stuck merges"
Closes #31207
See merge request !13207
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index c8ad3a7a5e0..c5c05bfe2fb 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -101,6 +101,7 @@ excluded_attributes: merge_requests: - :milestone_id - :ref_fetched + - :merge_jid award_emoji: - :awardable_id statuses: |