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
aeb9f76b
Commit
aeb9f76b
authored
Sep 02, 2020
by
Takuya Noguchi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix typos of committed in project views
Signed-off-by:
Takuya Noguchi
<
takninnovationresearch@gmail.com
>
parent
b720d175
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
ee/app/views/projects/settings/_restore.html.haml
ee/app/views/projects/settings/_restore.html.haml
+1
-1
ee/app/views/shared/push_rules/_form.html.haml
ee/app/views/shared/push_rules/_form.html.haml
+1
-1
ee/changelogs/unreleased/typos-committed-ee.yml
ee/changelogs/unreleased/typos-committed-ee.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+1
-1
No files found.
ee/app/views/projects/settings/_restore.html.haml
View file @
aeb9f76b
...
...
@@ -7,7 +7,7 @@
%strong
=
_
(
'This project will be removed on %{date}'
)
%
{
date:
date
}
%p
=
_
(
"Restoring the project will prevent the project from being removed on this date and restore people's ability to make changes to it."
)
=
_
(
"The repository can be commited to, and issues, comments and other entities can be created."
)
=
_
(
"The repository can be commit
t
ed to, and issues, comments and other entities can be created."
)
%strong
=
_
(
'Only active this projects shows up in the search and on the dashboard.'
)
=
link_to
_
(
'Restore project'
),
namespace_project_restore_path
(
project
.
namespace
,
project
),
method: :post
,
class:
"btn btn-remove"
ee/app/views/shared/push_rules/_form.html.haml
View file @
aeb9f76b
...
...
@@ -66,7 +66,7 @@
=
f
.
label
:file_name_regex
,
"Prohibited file names"
,
class:
"label-bold"
=
f
.
text_field
:file_name_regex
,
class:
"form-control"
,
placeholder:
'Example: (jar|exe)$'
,
data:
{
qa_selector:
'file_name_field'
}
.form-text.text-muted
All commited filenames must not match this
All commit
t
ed filenames must not match this
=
link_to
'regular expression'
,
'https://github.com/google/re2/wiki/Syntax'
to be pushed.
If this field is empty it allows any filenames.
...
...
ee/changelogs/unreleased/typos-committed-ee.yml
0 → 100644
View file @
aeb9f76b
---
title
:
Fix typos of committed in project views
merge_request
:
41038
author
:
Takuya Noguchi
type
:
other
locale/gitlab.pot
View file @
aeb9f76b
...
...
@@ -24829,7 +24829,7 @@ msgstr ""
msgid "The remote repository is being updated..."
msgstr ""
msgid "The repository can be commited to, and issues, comments and other entities can be created."
msgid "The repository can be commit
t
ed to, and issues, comments and other entities can be created."
msgstr ""
msgid "The repository for this project does not exist."
...
...
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