diff options
| author | Igor Drozdov <idrozdov@gitlab.com> | 2019-08-29 19:21:10 +0300 |
|---|---|---|
| committer | Igor Drozdov <idrozdov@gitlab.com> | 2019-08-29 19:31:21 +0300 |
| commit | 47484bf4f376bef02fed5eeae7f7dc70e774f91a (patch) | |
| tree | 1e29c74d41bd716e32a007a0a3f40b09fa5a65ea | |
| parent | f7e3693435307b56e4da8d8584c6af01459e4813 (diff) | |
| download | gitlab-ce-id-source-branch-cached-problem.tar.gz | |
Move source_branch_exists property to uncached entityid-source-branch-cached-problem
4 files changed, 5 insertions, 4 deletions
diff --git a/app/serializers/merge_request_poll_cached_widget_entity.rb b/app/serializers/merge_request_poll_cached_widget_entity.rb index 005a3e47bbb..4e34bf25d76 100644 --- a/app/serializers/merge_request_poll_cached_widget_entity.rb +++ b/app/serializers/merge_request_poll_cached_widget_entity.rb @@ -22,8 +22,6 @@ class MergeRequestPollCachedWidgetEntity < IssuableEntity expose :cannot_be_merged?, as: :has_conflicts expose :can_be_merged?, as: :can_be_merged expose :remove_source_branch?, as: :remove_source_branch - expose :source_branch_exists?, as: :source_branch_exists - expose :branch_missing?, as: :branch_missing expose :commits_without_merge_commits, using: MergeRequestWidgetCommitEntity do |merge_request| merge_request.commits.without_merge_commits diff --git a/app/serializers/merge_request_poll_widget_entity.rb b/app/serializers/merge_request_poll_widget_entity.rb index cd33ffa702a..755a7b698f4 100644 --- a/app/serializers/merge_request_poll_widget_entity.rb +++ b/app/serializers/merge_request_poll_widget_entity.rb @@ -1,6 +1,9 @@ # frozen_string_literal: true class MergeRequestPollWidgetEntity < IssuableEntity + expose :source_branch_exists?, as: :source_branch_exists + expose :branch_missing?, as: :branch_missing + 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 diff --git a/spec/fixtures/api/schemas/entities/merge_request_poll_cached_widget.json b/spec/fixtures/api/schemas/entities/merge_request_poll_cached_widget.json index e8959307767..faee238e149 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_poll_cached_widget.json +++ b/spec/fixtures/api/schemas/entities/merge_request_poll_cached_widget.json @@ -26,8 +26,6 @@ "has_conflicts": { "type": "boolean" }, "can_be_merged": { "type": "boolean" }, "remove_source_branch": { "type": ["boolean", "null"] }, - "source_branch_exists": { "type": "boolean" }, - "branch_missing": { "type": "boolean" }, "commits_without_merge_commits": { "type": "array" }, "diff_head_sha": { "type": ["string", "null"] }, "metrics": { diff --git a/spec/fixtures/api/schemas/entities/merge_request_poll_widget.json b/spec/fixtures/api/schemas/entities/merge_request_poll_widget.json index 1eda0e12920..3ee9f1b6335 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_poll_widget.json +++ b/spec/fixtures/api/schemas/entities/merge_request_poll_widget.json @@ -5,6 +5,8 @@ "iid": { "type": "integer" }, "description": { "type": ["string", "null"] }, "title": { "type": "string" }, + "source_branch_exists": { "type": "boolean" }, + "branch_missing": { "type": "boolean" }, "auto_merge_strategy": { "type": ["string", "null"] }, "available_auto_merge_strategies": { "type": "array" }, "source_branch_protected": { "type": "boolean" }, |