summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/queries/states/conflicts.query.graphql
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/queries/states/conflicts.query.graphql')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/queries/states/conflicts.query.graphql2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/queries/states/conflicts.query.graphql b/app/assets/javascripts/vue_merge_request_widget/queries/states/conflicts.query.graphql
index e66ac01ab12..faf21b28f86 100644
--- a/app/assets/javascripts/vue_merge_request_widget/queries/states/conflicts.query.graphql
+++ b/app/assets/javascripts/vue_merge_request_widget/queries/states/conflicts.query.graphql
@@ -1,6 +1,8 @@
query workInProgress($projectPath: ID!, $iid: String!) {
project(fullPath: $projectPath) {
+ id
mergeRequest(iid: $iid) {
+ id
shouldBeRebased
sourceBranchProtected
}