Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 16 insertions, 0 deletions

diff --git a/app/serializers/merge_request_poll_widget_entity.rb b/app/serializers/merge_request_poll_widget_entity.rb
index aad607f358a..a365ebc29c9 100644
--- a/app/serializers/merge_request_poll_widget_entity.rb
+++ b/app/serializers/merge_request_poll_widget_entity.rb
@@ -145,6 +145,22 @@ class MergeRequestPollWidgetEntity < Grape::Entity
     presenter(merge_request).revert_in_fork_path
   end
 
+  expose :squash_enabled_by_default do |merge_request|
+    presenter(merge_request).project.squash_enabled_by_default?
+  end
+
+  expose :squash_readonly do |merge_request|
+    presenter(merge_request).project.squash_readonly?
+  end
+
+  expose :squash_on_merge do |merge_request|
+    presenter(merge_request).squash_on_merge?
+  end
+
+  expose :approvals_widget_type do |merge_request|
+    presenter(merge_request).approvals_widget_type
+  end
+
   private
 
   delegate :current_user, to: :request