diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-29 21:09:52 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-29 21:09:52 +0000 |
| commit | b86a07e9b7332bf5d2815716b2220299ffd7a223 (patch) | |
| tree | 29206bd07a8af3885fe6c9d35f2e51daafadc38e /app/serializers/merge_request_poll_widget_entity.rb | |
| parent | 12a62cd94406f23fc3782e4914ca282196eb25f6 (diff) | |
| download | gitlab-ce-b86a07e9b7332bf5d2815716b2220299ffd7a223.tar.gz | |
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, 2 insertions, 2 deletions
diff --git a/app/serializers/merge_request_poll_widget_entity.rb b/app/serializers/merge_request_poll_widget_entity.rb index c27d571245b..99d6211b487 100644 --- a/app/serializers/merge_request_poll_widget_entity.rb +++ b/app/serializers/merge_request_poll_widget_entity.rb @@ -20,7 +20,7 @@ class MergeRequestPollWidgetEntity < Grape::Entity expose :merge_user, using: UserEntity expose :actual_head_pipeline, as: :pipeline, if: -> (mr, _) { presenter(mr).can_read_pipeline? } do |merge_request, options| - if Feature.enabled?(:merge_request_short_pipeline_serializer, merge_request.project) + if Feature.enabled?(:merge_request_short_pipeline_serializer, merge_request.project, default_enabled: true) MergeRequests::PipelineEntity.represent(merge_request.actual_head_pipeline, options) else PipelineDetailsEntity.represent(merge_request.actual_head_pipeline, options) @@ -28,7 +28,7 @@ class MergeRequestPollWidgetEntity < Grape::Entity end expose :merge_pipeline, if: ->(mr, _) { mr.merged? && can?(request.current_user, :read_pipeline, mr.target_project)} do |merge_request, options| - if Feature.enabled?(:merge_request_short_pipeline_serializer, merge_request.project) + if Feature.enabled?(:merge_request_short_pipeline_serializer, merge_request.project, default_enabled: true) MergeRequests::PipelineEntity.represent(merge_request.merge_pipeline, options) else PipelineDetailsEntity.represent(merge_request.merge_pipeline, options) |