Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 28 deletions

diff --git a/app/assets/javascripts/projects/settings/repository/branch_rules/app.vue b/app/assets/javascripts/projects/settings/repository/branch_rules/app.vue
index ecf194ccc3a..9b669024a8b 100644
--- a/app/assets/javascripts/projects/settings/repository/branch_rules/app.vue
+++ b/app/assets/javascripts/projects/settings/repository/branch_rules/app.vue
@@ -1,7 +1,7 @@
 <script>
 import { s__ } from '~/locale';
 import { createAlert } from '~/flash';
-import branchRulesQuery from './graphql/queries/branch_rules.query.graphql';
+import branchRulesQuery from 'ee_else_ce/projects/settings/repository/branch_rules/graphql/queries/branch_rules.query.graphql';
 import BranchRule from './components/branch_rule.vue';
 
 export const i18n = {
@@ -51,13 +51,13 @@ export default {
 <template>
   <div class="settings-content">
     <branch-rule
-      v-for="rule in branchRules"
-      :key="rule.name"
+      v-for="(rule, index) in branchRules"
+      :key="`${rule.name}-${index}`"
       :name="rule.name"
       :is-default="rule.isDefault"
       :branch-protection="rule.branchProtection"
-      :status-checks-total="rule.externalStatusChecks.nodes.length"
-      :approval-rules-total="rule.approvalRules.nodes.length"
+      :status-checks-total="rule.externalStatusChecks ? rule.externalStatusChecks.nodes.length : 0"
+      :approval-rules-total="rule.approvalRules ? rule.approvalRules.nodes.length : 0"
       :matching-branches-count="rule.matchingBranchesCount"
     />
 
diff --git a/app/assets/javascripts/projects/settings/repository/branch_rules/graphql/queries/branch_rules.query.graphql b/app/assets/javascripts/projects/settings/repository/branch_rules/graphql/queries/branch_rules.query.graphql
index 7bd8e6d4a64..a8cdda5505f 100644
--- a/app/assets/javascripts/projects/settings/repository/branch_rules/graphql/queries/branch_rules.query.graphql
+++ b/app/assets/javascripts/projects/settings/repository/branch_rules/graphql/queries/branch_rules.query.graphql
@@ -8,18 +8,11 @@ query getBranchRules($projectPath: ID!) {
         matchingBranchesCount
         branchProtection {
           allowForcePush
-          codeOwnerApprovalRequired
           mergeAccessLevels {
             edges {
               node {
                 accessLevel
                 accessLevelDescription
-                group {
-                  id
-                }
-                user {
-                  id
-                }
               }
             }
           }
@@ -28,26 +21,10 @@ query getBranchRules($projectPath: ID!) {
               node {
                 accessLevel
                 accessLevelDescription
-                group {
-                  id
-                }
-                user {
-                  id
-                }
               }
             }
           }
         }
-        externalStatusChecks {
-          nodes {
-            id
-          }
-        }
-        approvalRules {
-          nodes {
-            id
-          }
-        }
       }
     }
   }