diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-24 15:08:28 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-24 15:08:28 +0000 |
| commit | 8e1bb8745bafe36f273ce4a095c3576c38ceb8b4 (patch) | |
| tree | ec27d8dc078480009afe783f7bea87d3927f28f1 /app/serializers/merge_request_poll_cached_widget_entity.rb | |
| parent | 4b4c254b2cfaca26c2c8e2bda70d45c13e3a6f97 (diff) | |
| download | gitlab-ce-8e1bb8745bafe36f273ce4a095c3576c38ceb8b4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers/merge_request_poll_cached_widget_entity.rb')
| -rw-r--r-- | app/serializers/merge_request_poll_cached_widget_entity.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/serializers/merge_request_poll_cached_widget_entity.rb b/app/serializers/merge_request_poll_cached_widget_entity.rb index 9d001d18aa6..0c5af67bcda 100644 --- a/app/serializers/merge_request_poll_cached_widget_entity.rb +++ b/app/serializers/merge_request_poll_cached_widget_entity.rb @@ -18,7 +18,8 @@ class MergeRequestPollCachedWidgetEntity < IssuableEntity expose :rebase_in_progress?, as: :rebase_in_progress expose :commits_count expose :merge_ongoing?, as: :merge_ongoing - expose :work_in_progress?, as: :work_in_progress + expose :draft?, as: :draft + expose :draft?, as: :work_in_progress expose :cannot_be_merged?, as: :has_conflicts expose :can_be_merged?, as: :can_be_merged expose :remove_source_branch?, as: :remove_source_branch |