Commit c4deb2a5 authored by Nikola Milojevic's avatar Nikola Milojevic

Merge branch 'add_state_to_merge_request_diff_entity' into 'master'

Add state of merge request diff to the entity

See merge request gitlab-org/gitlab!64195
parents 0367ed10 ac2e3822
...@@ -16,6 +16,7 @@ class MergeRequestDiffEntity < Grape::Entity ...@@ -16,6 +16,7 @@ class MergeRequestDiffEntity < Grape::Entity
end end
expose :created_at expose :created_at
expose :state
expose :commits_count expose :commits_count
expose :latest?, as: :latest expose :latest?, as: :latest
......
...@@ -29,7 +29,7 @@ RSpec.describe MergeRequestDiffEntity do ...@@ -29,7 +29,7 @@ RSpec.describe MergeRequestDiffEntity do
expect(subject).to include( expect(subject).to include(
:version_index, :created_at, :commits_count, :version_index, :created_at, :commits_count,
:latest, :short_commit_sha, :version_path, :latest, :short_commit_sha, :version_path,
:compare_path :compare_path, :state
) )
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment