Add latest changes from gitlab-org/gitlab@master

6 files changed, 13 insertions, 7 deletions

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 679102fcd83..fb0f739934e 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -18,10 +18,11 @@ module UsersHelper
     return _('We also use email for avatar detection if no avatar is uploaded.') unless user.unconfirmed_email.present?
 
     confirmation_link = link_to _('Resend confirmation e-mail'), user_confirmation_path(user: { email: user.unconfirmed_email }), method: :post
-
-    h(_('Please click the link in the confirmation email before continuing. It was sent to ')) +
-      content_tag(:strong) { user.unconfirmed_email } + h('.') +
-      content_tag(:p) { confirmation_link }
+    h(_('Please click the link in the confirmation email before continuing. It was sent to %{html_tag_strong_start}%{email}%{html_tag_strong_end}.')) % {
+      html_tag_strong_start: '<strong>'.html_safe,
+      html_tag_strong_end: '</strong>'.html_safe,
+      email: user.unconfirmed_email
+    } + content_tag(:p) { confirmation_link }
   end
 
   def profile_tabs
diff --git a/app/views/projects/pages/new.html.haml b/app/views/projects/pages/new.html.haml
index cdd52a933e9..5dea6b02e36 100644
--- a/app/views/projects/pages/new.html.haml
+++ b/app/views/projects/pages/new.html.haml
@@ -1,4 +1,4 @@
-- if Feature.enabled?(:use_pipeline_wizard_for_pages, @group)
+- if Feature.enabled?(:use_pipeline_wizard_for_pages, @project.group)
   #js-pages{ data: @pipeline_wizard_data }
 
 - else
diff --git a/doc/development/documentation/site_architecture/deployment_process.md b/doc/development/documentation/site_architecture/deployment_process.md
index 5f6076f3195..bf45066c7db 100644
--- a/doc/development/documentation/site_architecture/deployment_process.md
+++ b/doc/development/documentation/site_architecture/deployment_process.md
@@ -156,6 +156,9 @@ production:
 The updated documentation is available in production after the `pages` and `pages:deploy` jobs
 complete in the new pipeline.
 
+If you do not have the Maintainer role to perform this task, ask for help in the
+`#docs` Slack channel.
+
 ## Docker files
 
 The [`dockerfiles` directory](https://gitlab.com/gitlab-org/gitlab-docs/blob/main/dockerfiles/) contains all needed
diff --git a/doc/user/compliance/license_compliance/index.md b/doc/user/compliance/license_compliance/index.md
index 1c9f9e85ab7..9d17f572a80 100644
--- a/doc/user/compliance/license_compliance/index.md
+++ b/doc/user/compliance/license_compliance/index.md
@@ -736,6 +736,8 @@ Note, the merge request is not able to be merged until the `denied` license is r
 You may add a [`License-Check` approval rule](#enabling-license-approvals-within-a-project),
 which enables a designated approver that can approve and then merge a merge request with `denied` license.
 
+These policies can be configured by using the [Managed Licenses API](../../../api/managed_licenses.md).
+
 ![Merge request with denied licenses](img/denied_licenses_v13_3.png)
 
 The **Policies** tab in the project's license compliance section displays your project's license
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 9bef7fa2c67..f9bac78a978 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -29392,7 +29392,7 @@ msgstr ""
 msgid "Please check your email (%{email}) to verify that you own this address and unlock the power of CI/CD. Didn't receive it? %{resend_link}. Wrong email address? %{update_link}."
 msgstr ""
 
-msgid "Please click the link in the confirmation email before continuing. It was sent to "
+msgid "Please click the link in the confirmation email before continuing. It was sent to %{html_tag_strong_start}%{email}%{html_tag_strong_end}."
 msgstr ""
 
 msgid "Please complete your profile with email address"
diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb
index 78a15f52be5..91e6305ea99 100644
--- a/spec/helpers/users_helper_spec.rb
+++ b/spec/helpers/users_helper_spec.rb
@@ -435,7 +435,7 @@ RSpec.describe UsersHelper do
 
       it 'contains resend confirmation e-mail text' do
         expect(user_email_help_text).to include _('Resend confirmation e-mail')
-        expect(user_email_help_text).to include _('Please click the link in the confirmation email before continuing. It was sent to ')
+        expect(user_email_help_text).to match /Please click the link in the confirmation email before continuing. It was sent to.*#{user.unconfirmed_email}/
       end
     end
   end