Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 20 deletions

diff --git a/app/assets/javascripts/projects/project_visibility.js b/app/assets/javascripts/projects/project_visibility.js
index 84b8936c17f..2dd5f821d90 100644
--- a/app/assets/javascripts/projects/project_visibility.js
+++ b/app/assets/javascripts/projects/project_visibility.js
@@ -44,21 +44,6 @@ function setVisibilityOptions({ name, visibility, showPath, editPath }) {
   });
 }
 
-function handleSelect2DropdownChange(namespaceSelector) {
-  if (!namespaceSelector || !('selectedIndex' in namespaceSelector)) {
-    return;
-  }
-  const selectedNamespace = namespaceSelector.options[namespaceSelector.selectedIndex];
-  setVisibilityOptions(selectedNamespace.dataset);
-}
-
 export default function initProjectVisibilitySelector() {
   eventHub.$on('update-visibility', setVisibilityOptions);
-
-  const namespaceSelector = document.querySelector('select.js-select-namespace');
-  if (namespaceSelector) {
-    const el = document.querySelector('.select2.js-select-namespace');
-    el.addEventListener('change', () => handleSelect2DropdownChange(namespaceSelector));
-    handleSelect2DropdownChange(namespaceSelector);
-  }
 }
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 61c37a2348a..9897f1cf054 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
@@ -1,10 +1,10 @@
 import { s__ } from '~/locale';
 
 export const I18N = {
-  manageProtectionsLinkTitle: s__('BranchRules|Manage in Protected Branches'),
-  targetBranch: s__('BranchRules|Target Branch'),
+  manageProtectionsLinkTitle: s__('BranchRules|Manage in protected branches'),
+  targetBranch: s__('BranchRules|Target branch'),
   branchNameOrPattern: s__('BranchRules|Branch name or pattern'),
-  branch: s__('BranchRules|Target Branch'),
+  branch: s__('BranchRules|Target branch'),
   allBranches: s__('BranchRules|All branches'),
   matchingBranchesLinkTitle: s__('BranchRules|%{total} matching %{subject}'),
   protectBranchTitle: s__('BranchRules|Protect branch'),
@@ -20,7 +20,7 @@ export const I18N = {
   ),
   disallowForcePushDescription: s__('BranchRules|Force push is not allowed.'),
   approvalsTitle: s__('BranchRules|Approvals'),
-  manageApprovalsLinkTitle: s__('BranchRules|Manage in Merge Request Approvals'),
+  manageApprovalsLinkTitle: s__('BranchRules|Manage in merge request approvals'),
   approvalsDescription: s__(
     'BranchRules|Approvals to ensure separation of duties for new merge requests. %{linkStart}Learn more.%{linkEnd}',
   ),
@@ -28,7 +28,7 @@ export const I18N = {
   statusChecksDescription: s__(
     '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'),
+  statusChecksLinkTitle: s__('BranchRules|Manage in status checks'),
   statusChecksHeader: s__('BranchRules|Status checks (%{total})'),
   allowedToPushHeader: s__('BranchRules|Allowed to push (%{total})'),
   allowedToMergeHeader: s__('BranchRules|Allowed to merge (%{total})'),