Add latest changes from gitlab-org/gitlab@master

5 files changed, 4 insertions, 43 deletions

diff --git a/app/assets/javascripts/projects/settings/components/default_branch_selector.vue b/app/assets/javascripts/projects/settings/components/default_branch_selector.vue
index fee2f591216..f5fb72e84bc 100644
--- a/app/assets/javascripts/projects/settings/components/default_branch_selector.vue
+++ b/app/assets/javascripts/projects/settings/components/default_branch_selector.vue
@@ -33,6 +33,5 @@ export default {
     :translations="$options.i18n"
     name="project[default_branch]"
     data-testid="default-branch-dropdown"
-    data-qa-selector="default_branch_dropdown"
   />
 </template>
diff --git a/app/views/projects/branch_defaults/_show.html.haml b/app/views/projects/branch_defaults/_show.html.haml
index 5906cd34c17..521d5bb9890 100644
--- a/app/views/projects/branch_defaults/_show.html.haml
+++ b/app/views/projects/branch_defaults/_show.html.haml
@@ -14,4 +14,4 @@
       %input{ name: 'update_section', type: 'hidden', value: 'js-issue-settings' }
         = render 'projects/branch_defaults/default_branch_fields', f: f
         = render 'projects/branch_defaults/branch_names_fields', f: f
-      = f.submit _('Save changes'), pajamas_button: true, data: { qa_selector: 'save_changes_button' }
+      = f.submit _('Save changes'), pajamas_button: true
diff --git a/doc/development/documentation/styleguide/word_list.md b/doc/development/documentation/styleguide/word_list.md
index 06ac500f3ce..96005e0ccd7 100644
--- a/doc/development/documentation/styleguide/word_list.md
+++ b/doc/development/documentation/styleguide/word_list.md
@@ -792,7 +792,9 @@ Do not use **handy**. If the user doesn't find the feature or process to be hand
 
 ## high availability, HA
 
-Do not use **high availability** or **HA**. Instead, direct readers to the GitLab [reference architectures](../../../administration/reference_architectures/index.md) for information about configuring GitLab for handling greater amounts of users.
+Do not use **high availability** or **HA**, except in the GitLab [reference architectures](../../../administration/reference_architectures/index.md#high-availability-ha). Instead, direct readers to the reference architectures for more information about configuring GitLab for handling greater amounts of users.
+
+Do not use phrases like **high availability setup** to mean a multiple node environment. Instead, use **multi-node setup** or similar.
 
 ## higher
 
diff --git a/qa/qa/page/project/settings/default_branch.rb b/qa/qa/page/project/settings/default_branch.rb
deleted file mode 100644
index a59158966c1..00000000000
--- a/qa/qa/page/project/settings/default_branch.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module QA
-  module Page
-    module Project
-      module Settings
-        class DefaultBranch < Page::Base
-          include ::QA::Page::Component::Dropdown
-
-          view 'app/views/projects/branch_defaults/_show.html.haml' do
-            element :save_changes_button
-          end
-
-          view 'app/assets/javascripts/projects/settings/components/default_branch_selector.vue' do
-            element :default_branch_dropdown
-          end
-
-          def set_default_branch(branch)
-            expand_select_list
-            search_and_select(branch)
-          end
-
-          def click_save_changes_button
-            find('.btn-confirm').click
-          end
-        end
-      end
-    end
-  end
-end
-
-QA::Page::Project::Settings::DefaultBranch.prepend_mod_with('Page::Project::Settings::DefaultBranch', namespace: QA)
diff --git a/qa/qa/page/project/settings/repository.rb b/qa/qa/page/project/settings/repository.rb
index c8ac01e98f8..a5871f6cd50 100644
--- a/qa/qa/page/project/settings/repository.rb
+++ b/qa/qa/page/project/settings/repository.rb
@@ -64,14 +64,6 @@ module QA
           def expand_branch_rules
             expand_content('branch-rules-content')
           end
-
-          def expand_default_branch(&block)
-            within('#branch-defaults-settings') do
-              find('.btn-default').click do
-                DefaultBranch.perform(&block)
-              end
-            end
-          end
         end
       end
     end