diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-17 15:10:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-17 15:10:12 +0300 |
| commit | 4203215d542505bba491a01d637479934c8005d6 (patch) | |
| tree | 000a956ac60247021ff8c36a1a17a1ea6ed1ff38 /spec/serializers/diffs_metadata_entity_spec.rb | |
| parent | 325318e2ddfcaedf0527053dd3c9bd62db547089 (diff) | |
Add latest changes from gitlab-org/gitlab@master
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 ) |