diff options
| author | George Koltsov <gkoltsov@gitlab.com> | 2019-07-12 10:05:55 +0100 |
|---|---|---|
| committer | George Koltsov <gkoltsov@gitlab.com> | 2019-07-15 10:30:39 +0100 |
| commit | ec512406857aecabc577b3fc70ec321982dd65a8 (patch) | |
| tree | 6e63826c8b4129e0a19ddca879a018689d763996 /spec/models/merge_request_spec.rb | |
| parent | ebed862a78c5561bb497fefa041172b4c7440c45 (diff) | |
| download | gitlab-ce-ec512406857aecabc577b3fc70ec321982dd65a8.tar.gz | |
Add commit_id to AttributeCleaner::ALLOWED_REFERENCESgeorgekoltsov/63955-fix-import-with-source-branch-deleted
Diffstat (limited to 'spec/models/merge_request_spec.rb')
| -rw-r--r-- | spec/models/merge_request_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 998765325ec..6a5bd276233 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -2454,13 +2454,13 @@ describe MergeRequest do describe "#diff_refs" do context "with diffs" do subject { create(:merge_request, :with_diffs) } - let(:expected_diff_refs) { + let(:expected_diff_refs) do Gitlab::Diff::DiffRefs.new( base_sha: subject.merge_request_diff.base_commit_sha, start_sha: subject.merge_request_diff.start_commit_sha, head_sha: subject.merge_request_diff.head_commit_sha ) - } + end it "does not touch the repository" do subject # Instantiate the object |