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
ad3904e5
Commit
ad3904e5
authored
May 04, 2020
by
Andrew Fontaine
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'patch-100' into 'master'
Indicate topics are optional See merge request gitlab-org/gitlab!30264
parents
25c3d639
fceb68d4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
app/views/projects/settings/_general.html.haml
app/views/projects/settings/_general.html.haml
+1
-1
changelogs/unreleased/topics-optional.yml
changelogs/unreleased/topics-optional.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+1
-1
No files found.
app/views/projects/settings/_general.html.haml
View file @
ad3904e5
...
...
@@ -16,7 +16,7 @@
.row
.form-group.col-md-9
=
f
.
label
:tag_list
,
_
(
'Topics'
),
class:
'label-bold'
=
f
.
label
:tag_list
,
_
(
'Topics
(optional)
'
),
class:
'label-bold'
=
f
.
text_field
:tag_list
,
value:
@project
.
tag_list
.
join
(
', '
),
maxlength:
2000
,
class:
"form-control"
%p
.form-text.text-muted
=
_
(
'Separate topics with commas.'
)
...
...
changelogs/unreleased/topics-optional.yml
0 → 100644
View file @
ad3904e5
---
title
:
Indicate topics are optional
merge_request
:
30264
author
:
Ben Bodenmiller
type
:
changed
locale/gitlab.pot
View file @
ad3904e5
...
...
@@ -22022,7 +22022,7 @@ msgstr ""
msgid "Too many projects enabled. You will need to manage them via the console or the API."
msgstr ""
msgid "Topics"
msgid "Topics
(optional)
"
msgstr ""
msgid "Total"
...
...
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