Add latest changes from gitlab-org/gitlab@master

6 files changed, 35 insertions, 8 deletions

diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 1f6f6697a5a..51fc9206ad1 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-7c28c2a9821c44f3b2115d7fcf74a4816c18dd6c
+bf27075ea5ea1b26eef72fb931b21a00950cb7ec
diff --git a/app/views/devise/mailer/unlock_instructions.html.haml b/app/views/devise/mailer/unlock_instructions.html.haml
index 8ddfd3ea74a..0c05ee4a6cd 100644
--- a/app/views/devise/mailer/unlock_instructions.html.haml
+++ b/app/views/devise/mailer/unlock_instructions.html.haml
@@ -1,8 +1,6 @@
 #content
-  = email_default_heading("Hello, #{@resource.name}!")
+  = email_default_heading(_("Hello, %{name}!") % { name: @resource.name })
   %p
-    Your GitLab account has been locked due to an excessive amount of unsuccessful
-    sign in attempts. Your account will automatically unlock in #{distance_of_time_in_words(Devise.unlock_in)}
-    or you may click the link below to unlock now.
+    = _("Your GitLab account has been locked due to an excessive amount of unsuccessful sign in attempts. Your account will automatically unlock in %{duration} or you may click the link below to unlock now.") % { duration: distance_of_time_in_words(Devise.unlock_in) }
   #cta
-    = link_to('Unlock account', unlock_url(@resource, unlock_token: @token))
+    = link_to(_('Unlock account'), unlock_url(@resource, unlock_token: @token))
diff --git a/changelogs/unreleased/Externalize-strings-in-unlock_instructions-html-haml.yml b/changelogs/unreleased/Externalize-strings-in-unlock_instructions-html-haml.yml
new file mode 100644
index 00000000000..2582b116eae
--- /dev/null
+++ b/changelogs/unreleased/Externalize-strings-in-unlock_instructions-html-haml.yml
@@ -0,0 +1,5 @@
+---
+title: Externalize strings in unlock_instructions.html.haml
+merge_request: 58227
+author: nuwe1
+type: other
diff --git a/doc/administration/gitaly/index.md b/doc/administration/gitaly/index.md
index 0f301c2cb5b..1a8e18ca2b2 100644
--- a/doc/administration/gitaly/index.md
+++ b/doc/administration/gitaly/index.md
@@ -459,6 +459,21 @@ You can run a gRPC trace with:
 sudo GRPC_TRACE=all GRPC_VERBOSITY=DEBUG gitlab-rake gitlab:gitaly:check
 ```
 
+### Server side gRPC logs
+
+gRPC tracing can also be enabled in Gitaly itself with the `GODEBUG=http2debug`
+environment variable. To set this in an Omnibus GitLab install:
+
+1. Add the following to your `gitlab.rb` file:
+
+   ```ruby
+   gitaly['env'] = {
+     "GODEBUG=http2debug" => "2"
+   }
+   ```
+
+1. [Reconfigure](../restart_gitlab.md#omnibus-gitlab-reconfigure) GitLab.
+
 ### Correlating Git processes with RPCs
 
 Sometimes you need to find out which Gitaly RPC created a particular Git process.
diff --git a/doc/user/compliance/license_compliance/index.md b/doc/user/compliance/license_compliance/index.md
index 257061f9ddb..823a0561beb 100644
--- a/doc/user/compliance/license_compliance/index.md
+++ b/doc/user/compliance/license_compliance/index.md
@@ -157,7 +157,7 @@ The `license_management` image already embeds many auto-detection scripts, langu
 and packages. Nevertheless, it's almost impossible to cover all cases for all projects.
 That's why sometimes it's necessary to install extra packages, or to have extra steps
 in the project automated setup, like the download and installation of a certificate.
-For that, a `LICENSE_MANAGEMENT_SETUP_CMD` CI/CD variable can be passed to the container,
+For that, a `SETUP_CMD` CI/CD variable can be passed to the container,
 with the required commands to run before the license detection.
 
 If present, this variable overrides the setup step necessary to install all the packages
@@ -171,7 +171,7 @@ include:
   - template: Security/License-Scanning.gitlab-ci.yml
 
 variables:
-  LICENSE_MANAGEMENT_SETUP_CMD: sh my-custom-install-script.sh
+  SETUP_CMD: sh my-custom-install-script.sh
 ```
 
 In this example, `my-custom-install-script.sh` is a shell script at the root
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 6f7d44e893e..b6200d61b69 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -15817,6 +15817,9 @@ msgstr ""
 msgid "Hello there"
 msgstr ""
 
+msgid "Hello, %{name}!"
+msgstr ""
+
 msgid "Hello, %{username}!"
 msgstr ""
 
@@ -33483,6 +33486,9 @@ msgstr ""
 msgid "Unlock"
 msgstr ""
 
+msgid "Unlock account"
+msgstr ""
+
 msgid "Unlock the discussion"
 msgstr ""
 
@@ -36189,6 +36195,9 @@ msgstr ""
 msgid "Your GitLab Ultimate trial will last 30 days after which point you can keep your free GitLab account forever. We just need some additional information to activate your trial."
 msgstr ""
 
+msgid "Your GitLab account has been locked due to an excessive amount of unsuccessful sign in attempts. Your account will automatically unlock in %{duration} or you may click the link below to unlock now."
+msgstr ""
+
 msgid "Your GitLab account request has been approved!"
 msgstr ""