Commit 40a8cdb0 authored by Thong Kuah's avatar Thong Kuah

Merge branch 'mjang-update-naming-topics-avatar-ui-text' into 'master'

Update Naming, topics, avatar modal with improved UI text

See merge request gitlab-org/gitlab!49275
parents e9d19d59 5ac7a5ec
......@@ -7,7 +7,7 @@
.settings-header
%h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only= _('Naming, topics, avatar')
%button.btn.btn-default.js-settings-toggle{ type: 'button' }= _('Collapse')
%p= _('Update your project name, topics, description and avatar.')
%p= _('Update your project name, topics, description, and avatar.')
.settings-content= render 'projects/settings/general'
%section.settings.sharing-permissions.no-animate#js-shared-permissions{ class: ('expanded' if expanded), data: { qa_selector: 'visibility_features_permissions_content' } }
......
= render 'shared/file_picker_button', f: f, field: :avatar, help_text: _("The maximum file size allowed is 200KB.")
= render 'shared/file_picker_button', f: f, field: :avatar, help_text: _("Max file size is 200 KB.")
---
title: Updated UI text to match style guidelines
merge_request: 49275
author:
type: other
......@@ -147,7 +147,7 @@ module Gitlab
initialize_with_readme: true,
visibility_level: VISIBILITY_LEVEL,
name: PROJECT_NAME,
description: "This project is automatically generated and will be used to help monitor this GitLab instance. [More information](#{docs_path})",
description: "This project is automatically generated and helps monitor this GitLab instance. [Learn more](#{docs_path}).",
namespace_id: group.id
}
end
......
......@@ -16765,6 +16765,9 @@ msgstr ""
msgid "Max access level"
msgstr ""
msgid "Max file size is 200 KB."
msgstr ""
msgid "Max role"
msgstr ""
......@@ -27417,9 +27420,6 @@ msgstr ""
msgid "The maximum file size allowed is %{size}."
msgstr ""
msgid "The maximum file size allowed is 200KB."
msgstr ""
msgid "The merge conflicts for this merge request cannot be resolved through GitLab. Please try to resolve them locally."
msgstr ""
......@@ -29614,7 +29614,7 @@ msgstr ""
msgid "Update your group name, description, avatar, and visibility."
msgstr ""
msgid "Update your project name, topics, description and avatar."
msgid "Update your project name, topics, description, and avatar."
msgstr ""
msgid "UpdateProject|Cannot rename project because it contains container registry tags!"
......
......@@ -118,8 +118,8 @@ RSpec.describe Gitlab::DatabaseImporters::SelfMonitoring::Project::CreateService
expect(result[:status]).to eq(:success)
expect(project.name).to eq(described_class::PROJECT_NAME)
expect(project.description).to eq(
'This project is automatically generated and will be used to help monitor this GitLab instance. ' \
"[More information](#{docs_path})"
'This project is automatically generated and helps monitor this GitLab instance. ' \
"[Learn more](#{docs_path})."
)
expect(File).to exist("doc/#{path}.md")
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment