From e218822bd553793cfed8caa02100285e0caa486e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 31 Dec 2021 12:12:14 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- app/views/profiles/show.html.haml | 8 ++++---- .../reference_architectures/25k_users.md | 2 +- doc/user/project/settings/index.md | 2 +- locale/gitlab.pot | 12 ++++++++++++ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index f3993ad8c33..5ac62f1695e 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -97,19 +97,19 @@ = render 'profiles/name', form: f, user: @user = f.text_field :id, class: 'gl-form-input', readonly: true, label: s_('Profiles|User ID'), wrapper: { class: 'col-md-3' } - = f.text_field :pronouns, class: 'input-md gl-form-input', help: s_("Profiles|Enter your pronouns to let people know how to refer to you") - = f.text_field :pronunciation, class: 'input-md gl-form-input', help: s_("Profiles|Enter how your name is pronounced to help people address you correctly") + = f.text_field :pronouns, label: s_('Profiles|Pronouns'), class: 'input-md gl-form-input', help: s_("Profiles|Enter your pronouns to let people know how to refer to you") + = f.text_field :pronunciation, label: s_('Profiles|Pronunciation'), class: 'input-md gl-form-input', help: s_("Profiles|Enter how your name is pronounced to help people address you correctly") = render_if_exists 'profiles/extra_settings', form: f = render_if_exists 'profiles/email_settings', form: f = f.text_field :skype, class: 'input-md gl-form-input', placeholder: s_("Profiles|username") = f.text_field :linkedin, class: 'input-md gl-form-input', help: s_("Profiles|Your LinkedIn profile name from linkedin.com/in/profilename") = f.text_field :twitter, class: 'input-md gl-form-input', placeholder: s_("Profiles|@username") - = f.text_field :website_url, class: 'input-lg gl-form-input', placeholder: s_("Profiles|https://website.com") + = f.text_field :website_url, label: s_('Profiles|Website url'), class: 'input-lg gl-form-input', placeholder: s_("Profiles|https://website.com") - if @user.read_only_attribute?(:location) = f.text_field :location, class: 'gl-form-input', readonly: true, help: s_("Profiles|Your location was automatically set based on your %{provider_label} account") % { provider_label: attribute_provider_label(:location) } - else = f.text_field :location, label: s_('Profiles|Location'), class: 'input-lg gl-form-input', placeholder: s_("Profiles|City, country") - = f.text_field :job_title, class: 'input-md gl-form-input' + = f.text_field :job_title, label: s_('Profiles|Job title'), class: 'input-md gl-form-input' = f.text_field :organization, label: s_('Profiles|Organization'), class: 'input-md gl-form-input', help: s_("Profiles|Who you represent or work for") = f.text_area :bio, class: 'gl-form-input', label: s_('Profiles|Bio'), rows: 4, maxlength: 250, help: s_("Profiles|Tell us about yourself in fewer than 250 characters") %hr diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md index 24b3350bd75..5b9ce14c623 100644 --- a/doc/administration/reference_architectures/25k_users.md +++ b/doc/administration/reference_architectures/25k_users.md @@ -26,7 +26,7 @@ full list of reference architectures, see | PgBouncer1 | 3 | 2 vCPU, 1.8 GB memory | `n1-highcpu-2` | `c5.large` | `F2s v2` | | Internal load balancing node3 | 1 | 4 vCPU, 3.6GB memory | `n1-highcpu-4` | `c5.large` | `F2s v2` | | Redis/Sentinel - Cache2 | 3 | 4 vCPU, 15 GB memory | `n1-standard-4` | `m5.xlarge` | `D4s v3` | -| Redis/Sentinel - Persistent2 | 3 | 4 vCPU, 15 GB memory | `n1-standard-4` | `m5.large` | `D4s v3` | +| Redis/Sentinel - Persistent2 | 3 | 4 vCPU, 15 GB memory | `n1-standard-4` | `m5.xlarge` | `D4s v3` | | Gitaly5 | 3 | 32 vCPU, 120 GB memory | `n1-standard-32` | `m5.8xlarge` | `D32s v3` | | Praefect5 | 3 | 4 vCPU, 3.6 GB memory | `n1-highcpu-4` | `c5.xlarge` | `F4s v2` | | Praefect PostgreSQL1 | 1+ | 2 vCPU, 1.8 GB memory | `n1-highcpu-2` | `c5.large` | `F2s v2` | diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md index 1608fda8516..acbea2c8e66 100644 --- a/doc/user/project/settings/index.md +++ b/doc/user/project/settings/index.md @@ -270,7 +270,7 @@ Some features depend on others: - If you disable the **Issues** option, GitLab also removes the following features: - - **issue boards** + - **Issue Boards** - [**Service Desk**](#service-desk) NOTE: diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 513b76477d1..ed7e206f6b3 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -27076,6 +27076,9 @@ msgstr "" msgid "Profiles|Invalid username" msgstr "" +msgid "Profiles|Job title" +msgstr "" + msgid "Profiles|Key" msgstr "" @@ -27133,6 +27136,12 @@ msgstr "" msgid "Profiles|Profile was successfully updated" msgstr "" +msgid "Profiles|Pronouns" +msgstr "" + +msgid "Profiles|Pronunciation" +msgstr "" + msgid "Profiles|Public avatar" msgstr "" @@ -27217,6 +27226,9 @@ msgstr "" msgid "Profiles|Using emojis in names seems fun, but please try to set a status message instead" msgstr "" +msgid "Profiles|Website url" +msgstr "" + msgid "Profiles|What's your status?" msgstr ""