diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /spec/serializers/diffs_metadata_entity_spec.rb | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'spec/serializers/diffs_metadata_entity_spec.rb')
-rw-r--r-- | spec/serializers/diffs_metadata_entity_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/serializers/diffs_metadata_entity_spec.rb b/spec/serializers/diffs_metadata_entity_spec.rb index 8ed47569b75..e8cbc2076d7 100644 --- a/spec/serializers/diffs_metadata_entity_spec.rb +++ b/spec/serializers/diffs_metadata_entity_spec.rb @@ -30,6 +30,7 @@ RSpec.describe DiffsMetadataEntity do :email_patch_path, :plain_diff_path, :merge_request_diffs, :context_commits, :definition_path_prefix, :source_branch_exists, + :can_merge, :conflict_resolution_path, :has_conflicts, # Attributes :diff_files ) |