diff options
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 ) |