Add latest changes from gitlab-org/gitlab@master

9 files changed, 23 insertions, 13 deletions

diff --git a/app/views/shared/empty_states/_wikis.html.haml b/app/views/shared/empty_states/_wikis.html.haml
index 656acafd416..4150406a4ea 100644
--- a/app/views/shared/empty_states/_wikis.html.haml
+++ b/app/views/shared/empty_states/_wikis.html.haml
@@ -3,7 +3,7 @@
 
 - if can?(current_user, :create_wiki, @wiki.container)
   - create_path = wiki_page_path(@wiki, params[:id], view: 'create')
-  - create_link = link_to s_('WikiEmpty|Create your first page'), create_path, class: 'btn btn-success qa-create-first-page-link', title: s_('WikiEmpty|Create your first page')
+  - create_link = link_to s_('WikiEmpty|Create your first page'), create_path, class: 'btn gl-button btn-success qa-create-first-page-link', title: s_('WikiEmpty|Create your first page')
 
   = render layout: layout_path, locals: { image_path: 'illustrations/wiki_login_empty.svg' } do
     %h4.text-left
@@ -14,11 +14,11 @@
     - if show_enable_confluence_integration?(@wiki.container)
       = link_to s_('WikiEmpty|Enable the Confluence Wiki integration'),
           edit_project_service_path(@project, :confluence),
-          class: 'btn', title: s_('WikiEmpty|Enable the Confluence Wiki integration')
+          class: 'btn gl-button', title: s_('WikiEmpty|Enable the Confluence Wiki integration')
 
 - elsif @project && can?(current_user, :read_issue, @project)
   - issues_link = link_to s_('WikiEmptyIssueMessage|issue tracker'), project_issues_path(@project)
-  - new_issue_link = link_to s_('WikiEmpty|Suggest wiki improvement'), new_project_issue_path(@project), class: 'btn btn-success', title: s_('WikiEmptyIssueMessage|Suggest wiki improvement')
+  - new_issue_link = link_to s_('WikiEmpty|Suggest wiki improvement'), new_project_issue_path(@project), class: 'btn gl-button btn-success', title: s_('WikiEmptyIssueMessage|Suggest wiki improvement')
 
   = render layout: layout_path, locals: { image_path: 'illustrations/wiki_logout_empty.svg' } do
     %h4
diff --git a/app/views/shared/wikis/_form.html.haml b/app/views/shared/wikis/_form.html.haml
index f9088ed6d79..a19ab527ece 100644
--- a/app/views/shared/wikis/_form.html.haml
+++ b/app/views/shared/wikis/_form.html.haml
@@ -70,10 +70,10 @@
 
   .form-actions
     - if @page && @page.persisted?
-      = f.submit _("Save changes"), class: 'btn-success btn qa-save-changes-button'
+      = f.submit _("Save changes"), class: 'btn gl-button btn-success qa-save-changes-button'
       .float-right
-        = link_to _("Cancel"), wiki_page_path(@wiki, @page), class: 'btn gl-button btn-cancel btn-grouped'
+        = link_to _("Cancel"), wiki_page_path(@wiki, @page), class: 'btn gl-button btn-cancel btn-default'
     - else
-      = f.submit s_("Wiki|Create page"), class: 'btn-success btn qa-create-page-button rspec-create-page-button'
+      = f.submit s_("Wiki|Create page"), class: 'btn-success gl-button btn qa-create-page-button rspec-create-page-button'
       .float-right
-        = link_to _("Cancel"), wiki_path(@wiki), class: 'btn gl-button btn-cancel'
+        = link_to _("Cancel"), wiki_path(@wiki), class: 'btn gl-button btn-cancel btn-default'
diff --git a/app/views/sherlock/transactions/show.html.haml b/app/views/sherlock/transactions/show.html.haml
index 8f2b36123bb..162b14f01e1 100644
--- a/app/views/sherlock/transactions/show.html.haml
+++ b/app/views/sherlock/transactions/show.html.haml
@@ -18,8 +18,8 @@
 
 .row-content-block
   .float-right
-    = link_to(sherlock_transactions_path, class: 'btn') do
-      = sprite_icon('arrow-left')
+    = link_to(sherlock_transactions_path, class: 'gl-button btn') do
+      = sprite_icon('arrow-left', css_class: 'gl-mr-3')
       = t('sherlock.all_transactions')
   .oneline
     = t('sherlock.transaction')
diff --git a/changelogs/unreleased/231217-yo-gitlab-ui.yml b/changelogs/unreleased/231217-yo-gitlab-ui.yml
new file mode 100644
index 00000000000..af7bc280b69
--- /dev/null
+++ b/changelogs/unreleased/231217-yo-gitlab-ui.yml
@@ -0,0 +1,5 @@
+---
+title: Apply GitLab UI button styles to buttons in project wiki
+merge_request: 51780
+author: Yogi (@yo)
+type: other
diff --git a/changelogs/unreleased/ApplyGitLabUIbuttonstylestobuttonsintrascations_show-html-haml.yml b/changelogs/unreleased/ApplyGitLabUIbuttonstylestobuttonsintrascations_show-html-haml.yml
new file mode 100644
index 00000000000..73f4656f1ca
--- /dev/null
+++ b/changelogs/unreleased/ApplyGitLabUIbuttonstylestobuttonsintrascations_show-html-haml.yml
@@ -0,0 +1,5 @@
+---
+title: Apply GitLab UI button styles to buttons in transactions show.html.haml files
+merge_request: 51096
+author: nuwe1
+type: other
diff --git a/doc/administration/auth/ldap/google_secure_ldap.md b/doc/administration/auth/ldap/google_secure_ldap.md
index dcfb77f277e..6fecf74d935 100644
--- a/doc/administration/auth/ldap/google_secure_ldap.md
+++ b/doc/administration/auth/ldap/google_secure_ldap.md
@@ -20,7 +20,7 @@ The steps below cover:
 
 ## Configuring Google LDAP client
 
-1. Navigate to <https://admin.google.com/Dashboard> and sign in as a GSuite domain administrator.
+1. Navigate to <https://admin.google.com/Dashboard> and sign in as a Google Workspace domain administrator.
 
 1. Go to **Apps > LDAP > Add Client**.
 
diff --git a/qa/qa/resource/protected_branch.rb b/qa/qa/resource/protected_branch.rb
index 51ea9d1c5b9..7eb5442a964 100644
--- a/qa/qa/resource/protected_branch.rb
+++ b/qa/qa/resource/protected_branch.rb
@@ -22,7 +22,7 @@ module QA
         Resource::Repository::Commit.fabricate_via_api! do |commit|
           commit.project = project
           commit.branch = branch_name
-          commit.start_branch = 'master'
+          commit.start_branch = project.default_branch
           commit.commit_message = 'Add new file'
           commit.add_files([
             { file_path: "new_file-#{SecureRandom.hex(8)}.md", content: 'new file' }
diff --git a/qa/qa/specs/features/browser_ui/5_package/maven_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/maven_repository_spec.rb
index 0bd153cbe40..605248e33f7 100644
--- a/qa/qa/specs/features/browser_ui/5_package/maven_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/maven_repository_spec.rb
@@ -132,7 +132,7 @@ module QA
                       - 'mvn deploy -s settings.xml'
                       - "mvn dependency:get -Dartifact=#{group_id}:#{artifact_id}:1.0"
                     only:
-                      - master
+                      - "#{project.default_branch}"
                     tags:
                       - "runner-for-#{project.name}"
                 YAML
diff --git a/spec/factories/ci_platform_metrics.rb b/spec/factories/ci_platform_metrics.rb
index 478f9715021..6a517376d65 100644
--- a/spec/factories/ci_platform_metrics.rb
+++ b/spec/factories/ci_platform_metrics.rb
@@ -4,6 +4,6 @@ FactoryBot.define do
   factory :ci_platform_metric do
     recorded_at { Time.zone.now }
     platform_target { generate(:title) }
-    count { SecureRandom.random_number(100) }
+    count { SecureRandom.random_number(100) + 1 }
   end
 end