From 94221585cabf666f38ac989978838393fc3bf56e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 23 Jun 2020 00:08:58 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/models/merge_request_spec.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'spec/models/merge_request_spec.rb') diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index c70ddac5da6..031b0688c7b 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1170,6 +1170,12 @@ describe MergeRequest do expect(subject.can_remove_source_branch?(user)).to be_falsey end + it "can't be removed because source project has been deleted" do + subject.source_project = nil + + expect(subject.can_remove_source_branch?(user)).to be_falsey + end + it "can't remove a root ref" do subject.update(source_branch: 'master', target_branch: 'feature') -- cgit v1.2.1