diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-28 18:09:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-28 18:09:57 +0300 |
| commit | 1d9f78b3a4ecd36806890e80e513242d0fdf7b6e (patch) | |
| tree | 80ea387bd0d33a19d2213be6aa30c39d67ffb9e5 /spec/serializers/diffs_entity_spec.rb | |
| parent | b1e352740bd52771b419829abef0a0ad73141ac1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/serializers/diffs_entity_spec.rb')
| -rw-r--r-- | spec/serializers/diffs_entity_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/serializers/diffs_entity_spec.rb b/spec/serializers/diffs_entity_spec.rb index ea58fcb194e..aef7d3732f8 100644 --- a/spec/serializers/diffs_entity_spec.rb +++ b/spec/serializers/diffs_entity_spec.rb @@ -93,7 +93,7 @@ RSpec.describe DiffsEntity do let(:diff_file_without_conflict) { diff_files.to_a[-2] } let(:resolvable_conflicts) { true } - let(:conflict_file) { double(path: diff_file_with_conflict.new_path) } + let(:conflict_file) { double(path: diff_file_with_conflict.new_path, conflict_type: :both_modified) } let(:conflicts) { double(conflicts: double(files: [conflict_file]), can_be_resolved_in_ui?: resolvable_conflicts) } let(:merge_ref_head_diff) { true } |