Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/models/timelog_spec.rb b/spec/models/timelog_spec.rb
index ae1697fb7e6..e9019b55635 100644
--- a/spec/models/timelog_spec.rb
+++ b/spec/models/timelog_spec.rb
@@ -40,6 +40,14 @@ RSpec.describe Timelog do
 
       expect(subject).to be_valid
     end
+
+    describe 'when importing' do
+      it 'is valid if issue_id and merge_request_id are missing' do
+        subject.attributes = { issue: nil, merge_request: nil, importing: true }
+
+        expect(subject).to be_valid
+      end
+    end
   end
 
   describe 'scopes' do