Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
5ac7a5ec
Commit
5ac7a5ec
authored
Dec 09, 2020
by
Mike Jang
Committed by
Thong Kuah
Dec 09, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Naming, topics, avatar modal with improved UI text
parent
c5995a35
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
9 deletions
+14
-9
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+1
-1
app/views/shared/_choose_avatar_button.html.haml
app/views/shared/_choose_avatar_button.html.haml
+1
-1
changelogs/unreleased/mjang-update-naming-topics-avatar-ui-text.yml
.../unreleased/mjang-update-naming-topics-avatar-ui-text.yml
+5
-0
lib/gitlab/database_importers/self_monitoring/project/create_service.rb
...abase_importers/self_monitoring/project/create_service.rb
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+4
-4
spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb
..._importers/self_monitoring/project/create_service_spec.rb
+2
-2
No files found.
app/views/projects/edit.html.haml
View file @
5ac7a5ec
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
.settings-header
.settings-header
%h4
.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
=
_
(
'Naming, topics, avatar'
)
%h4
.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
=
_
(
'Naming, topics, avatar'
)
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}=
_
(
'Collapse'
)
%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'
.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'
}
}
%section
.settings.sharing-permissions.no-animate
#js-shared-permissions
{
class:
(
'expanded'
if
expanded
),
data:
{
qa_selector:
'visibility_features_permissions_content'
}
}
...
...
app/views/shared/_choose_avatar_button.html.haml
View file @
5ac7a5ec
=
render
'shared/file_picker_button'
,
f:
f
,
field: :avatar
,
help_text:
_
(
"
The maximum file size allowed is 200
KB."
)
=
render
'shared/file_picker_button'
,
f:
f
,
field: :avatar
,
help_text:
_
(
"
Max file size is 200
KB."
)
changelogs/unreleased/mjang-update-naming-topics-avatar-ui-text.yml
0 → 100644
View file @
5ac7a5ec
---
title
:
Updated UI text to match style guidelines
merge_request
:
49275
author
:
type
:
other
lib/gitlab/database_importers/self_monitoring/project/create_service.rb
View file @
5ac7a5ec
...
@@ -147,7 +147,7 @@ module Gitlab
...
@@ -147,7 +147,7 @@ module Gitlab
initialize_with_readme:
true
,
initialize_with_readme:
true
,
visibility_level:
VISIBILITY_LEVEL
,
visibility_level:
VISIBILITY_LEVEL
,
name:
PROJECT_NAME
,
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
namespace_id:
group
.
id
}
}
end
end
...
...
locale/gitlab.pot
View file @
5ac7a5ec
...
@@ -16771,6 +16771,9 @@ msgstr ""
...
@@ -16771,6 +16771,9 @@ msgstr ""
msgid "Max access level"
msgid "Max access level"
msgstr ""
msgstr ""
msgid "Max file size is 200 KB."
msgstr ""
msgid "Max role"
msgid "Max role"
msgstr ""
msgstr ""
...
@@ -27414,9 +27417,6 @@ msgstr ""
...
@@ -27414,9 +27417,6 @@ msgstr ""
msgid "The maximum file size allowed is %{size}."
msgid "The maximum file size allowed is %{size}."
msgstr ""
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."
msgid "The merge conflicts for this merge request cannot be resolved through GitLab. Please try to resolve them locally."
msgstr ""
msgstr ""
...
@@ -29611,7 +29611,7 @@ msgstr ""
...
@@ -29611,7 +29611,7 @@ msgstr ""
msgid "Update your group name, description, avatar, and visibility."
msgid "Update your group name, description, avatar, and visibility."
msgstr ""
msgstr ""
msgid "Update your project name, topics, description and avatar."
msgid "Update your project name, topics, description
,
and avatar."
msgstr ""
msgstr ""
msgid "UpdateProject|Cannot rename project because it contains container registry tags!"
msgid "UpdateProject|Cannot rename project because it contains container registry tags!"
...
...
spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb
View file @
5ac7a5ec
...
@@ -118,8 +118,8 @@ RSpec.describe Gitlab::DatabaseImporters::SelfMonitoring::Project::CreateService
...
@@ -118,8 +118,8 @@ RSpec.describe Gitlab::DatabaseImporters::SelfMonitoring::Project::CreateService
expect
(
result
[
:status
]).
to
eq
(
:success
)
expect
(
result
[
:status
]).
to
eq
(
:success
)
expect
(
project
.
name
).
to
eq
(
described_class
::
PROJECT_NAME
)
expect
(
project
.
name
).
to
eq
(
described_class
::
PROJECT_NAME
)
expect
(
project
.
description
).
to
eq
(
expect
(
project
.
description
).
to
eq
(
'This project is automatically generated and
will be used to help
monitor this GitLab instance. '
\
'This project is automatically generated and
helps
monitor this GitLab instance. '
\
"[
More information](
#{
docs_path
}
)
"
"[
Learn more](
#{
docs_path
}
).
"
)
)
expect
(
File
).
to
exist
(
"doc/
#{
path
}
.md"
)
expect
(
File
).
to
exist
(
"doc/
#{
path
}
.md"
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment