diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 21:08:35 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 21:08:35 +0000 |
| commit | 24256212ea84e6fb6509f6fb317a2d2bac3d0d06 (patch) | |
| tree | e4300d70d8e724179d9de657a68d88462aaaf04a /app/serializers | |
| parent | d933bc5a8738d24898c5a82cc72ee9bd050425e6 (diff) | |
| download | gitlab-ce-24256212ea84e6fb6509f6fb317a2d2bac3d0d06.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/merge_request_widget_entity.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/app/serializers/merge_request_widget_entity.rb b/app/serializers/merge_request_widget_entity.rb index 2a81931c49f..adc4d08a6f6 100644 --- a/app/serializers/merge_request_widget_entity.rb +++ b/app/serializers/merge_request_widget_entity.rb @@ -67,14 +67,6 @@ class MergeRequestWidgetEntity < Grape::Entity end end - def as_json(options = {}) - return super(options) if Feature.enabled?(:async_mr_widget) - - super(options) - .merge(MergeRequestPollCachedWidgetEntity.new(object, **@options.opts_hash).as_json(options)) - .merge(MergeRequestPollWidgetEntity.new(object, **@options.opts_hash).as_json(options)) - end - private delegate :current_user, to: :request |