diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
| commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
| tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /app/serializers/merge_request_poll_cached_widget_entity.rb | |
| parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) | |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
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 |