Add latest changes from gitlab-org/gitlab@master

3 files changed, 10 insertions, 3 deletions

diff --git a/app/assets/javascripts/projects/settings/branch_rules/components/view/constants.js b/app/assets/javascripts/projects/settings/branch_rules/components/view/constants.js
index 9def0bdc3e5..6da058ebc9c 100644
--- a/app/assets/javascripts/projects/settings/branch_rules/components/view/constants.js
+++ b/app/assets/javascripts/projects/settings/branch_rules/components/view/constants.js
@@ -21,11 +21,11 @@ export const I18N = {
   approvalsTitle: s__('BranchRules|Approvals'),
   manageApprovalsLinkTitle: s__('BranchRules|Manage in Merge Request Approvals'),
   approvalsDescription: s__(
-    'BranchRules|Approvals to ensure separation of duties for new merge requests. %{linkStart}Lean more.%{linkEnd}',
+    'BranchRules|Approvals to ensure separation of duties for new merge requests. %{linkStart}Learn more.%{linkEnd}',
   ),
   statusChecksTitle: s__('BranchRules|Status checks'),
   statusChecksDescription: s__(
-    'BranchRules|Check for a status response in merge requests. Failures do not block merges. %{linkStart}Lean more.%{linkEnd}',
+    'BranchRules|Check for a status response in merge requests. Failures do not block merges. %{linkStart}Learn more.%{linkEnd}',
   ),
   statusChecksLinkTitle: s__('BranchRules|Manage in Status checks'),
   statusChecksHeader: s__('BranchRules|Status checks (%{total})'),
diff --git a/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue b/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue
index 38bffb886e0..eb11e17dd1b 100644
--- a/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue
+++ b/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue
@@ -54,7 +54,7 @@ export default {
         const branchRule = branchRules.nodes.find((rule) => rule.name === this.branch);
         this.branchProtection = branchRule?.branchProtection;
         this.approvalRules = branchRule?.approvalRules;
-        this.statusChecks = branchRule?.externalStatusChecks || [];
+        this.statusChecks = branchRule?.externalStatusChecks?.nodes || [];
       },
     },
   },
diff --git a/app/assets/javascripts/projects/settings/branch_rules/queries/branch_rules_details.query.graphql b/app/assets/javascripts/projects/settings/branch_rules/queries/branch_rules_details.query.graphql
index 4ca474a5ceb..aa1e4923aa8 100644
--- a/app/assets/javascripts/projects/settings/branch_rules/queries/branch_rules_details.query.graphql
+++ b/app/assets/javascripts/projects/settings/branch_rules/queries/branch_rules_details.query.graphql
@@ -61,6 +61,13 @@ query getBranchRulesDetails($projectPath: ID!) {
             }
           }
         }
+        externalStatusChecks {
+          nodes {
+            id
+            name
+            externalUrl
+          }
+        }
       }
     }
   }