root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2023-11-06 09:11:39 +00:00
parent 4725ea9b10
commit aaa09b5617
5 changed files with 4 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/projects/settings/components/default_branch_selector.vue
View File

@ -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>

2
app/views/projects/branch_defaults/_show.html.haml
View File

@ -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

4
doc/development/documentation/styleguide/word_list.md
View File

@ -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

32
qa/qa/page/project/settings/default_branch.rb
View File

@ -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)

8
qa/qa/page/project/settings/repository.rb
View File

@ -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