Add latest changes from gitlab-org/gitlab@master

3 files changed, 11 insertions, 1 deletions

diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index d97d76cf35e..f6a3ade7f18 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -10,6 +10,7 @@ issues:
 - resource_label_events
 - resource_weight_events
 - resource_milestone_events
+- sent_notifications
 - sentry_issue
 - label_links
 - labels
diff --git a/spec/lib/gitlab/import_export/base/relation_factory_spec.rb b/spec/lib/gitlab/import_export/base/relation_factory_spec.rb
index 1011de83c95..50d93763ad6 100644
--- a/spec/lib/gitlab/import_export/base/relation_factory_spec.rb
+++ b/spec/lib/gitlab/import_export/base/relation_factory_spec.rb
@@ -33,6 +33,15 @@ describe Gitlab::ImportExport::Base::RelationFactory do
       end
     end
 
+    context 'when the relation is predefined' do
+      let(:relation_sym) { :milestone }
+      let(:relation_hash) { { 'name' => '#upcoming', 'title' => 'Upcoming', 'id' => -2 } }
+
+      it 'returns without creating a new relation' do
+        expect(subject).to be_nil
+      end
+    end
+
     context 'when #setup_models is not implemented' do
       it 'raises NotImplementedError' do
         expect { subject }.to raise_error(NotImplementedError)
diff --git a/spec/lib/gitlab/import_export/group/tree_saver_spec.rb b/spec/lib/gitlab/import_export/group/tree_saver_spec.rb
index 845eb8e308b..a7440ac24ca 100644
--- a/spec/lib/gitlab/import_export/group/tree_saver_spec.rb
+++ b/spec/lib/gitlab/import_export/group/tree_saver_spec.rb
@@ -189,7 +189,7 @@ describe Gitlab::ImportExport::Group::TreeSaver do
     create(:group_badge, group: group)
     group_label = create(:group_label, group: group)
     create(:label_priority, label: group_label, priority: 1)
-    board = create(:board, group: group)
+    board = create(:board, group: group, milestone_id: Milestone::Upcoming.id)
     create(:list, board: board, label: group_label)
     create(:group_badge, group: group)