diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-29 12:06:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-29 12:06:31 +0300 |
| commit | 6b13a226ddfc49140d58e7e88f8703ae0ed90574 (patch) | |
| tree | 9a92431e484354f43230fa87adc00a2edbf6f09c /app/serializers/merge_request_poll_widget_entity.rb | |
| parent | 2ac93cb80c4c0a57fde86de8262b569d1e9b9e51 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers/merge_request_poll_widget_entity.rb')
| -rw-r--r-- | app/serializers/merge_request_poll_widget_entity.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/serializers/merge_request_poll_widget_entity.rb b/app/serializers/merge_request_poll_widget_entity.rb index 2a61187a856..028de38e42a 100644 --- a/app/serializers/merge_request_poll_widget_entity.rb +++ b/app/serializers/merge_request_poll_widget_entity.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true -class MergeRequestPollWidgetEntity < IssuableEntity +class MergeRequestPollWidgetEntity < Grape::Entity + include RequestAwareEntity + expose :auto_merge_strategy expose :available_auto_merge_strategies do |merge_request| AutoMergeService.new(merge_request.project, current_user).available_strategies(merge_request) # rubocop: disable CodeReuse/ServiceClass |