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
cad5dbbc
Commit
cad5dbbc
authored
Mar 30, 2021
by
Marcin Sedlak-Jakubowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix unnecessary period in MR settings
parent
5eabe70d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ee/app/views/projects/_merge_trains_settings.html.haml
ee/app/views/projects/_merge_trains_settings.html.haml
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+1
-1
No files found.
ee/app/views/projects/_merge_trains_settings.html.haml
View file @
cad5dbbc
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
.gl-pl-6
.gl-pl-6
=
form
.
check_box
:merge_trains_enabled
,
class:
'form-check-input js-merge-options-merge-trains gl-pl-6'
,
data:
{
qa_selector:
'merge_trains_checkbox'
}
=
form
.
check_box
:merge_trains_enabled
,
class:
'form-check-input js-merge-options-merge-trains gl-pl-6'
,
data:
{
qa_selector:
'merge_trains_checkbox'
}
=
form
.
label
:merge_trains_enabled
,
class:
'form-check-label'
do
=
form
.
label
:merge_trains_enabled
,
class:
'form-check-label'
do
=
s_
(
'ProjectSettings|Enable merge trains
.
'
)
=
s_
(
'ProjectSettings|Enable merge trains'
)
.text-secondary.mb-2
.text-secondary.mb-2
-
merge_trains_help_link_url
=
help_page_path
(
'ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md'
)
-
merge_trains_help_link_url
=
help_page_path
(
'ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md'
)
-
merge_trains_help_link_start
=
'<a href="%{url}" target="_blank" rel="noopener noreferrer">'
.
html_safe
%
{
url:
merge_trains_help_link_url
}
-
merge_trains_help_link_start
=
'<a href="%{url}" target="_blank" rel="noopener noreferrer">'
.
html_safe
%
{
url:
merge_trains_help_link_url
}
...
...
locale/gitlab.pot
View file @
cad5dbbc
...
@@ -24125,7 +24125,7 @@ msgstr ""
...
@@ -24125,7 +24125,7 @@ msgstr ""
msgid "ProjectSettings|Enable \"Delete source branch\" option by default"
msgid "ProjectSettings|Enable \"Delete source branch\" option by default"
msgstr ""
msgstr ""
msgid "ProjectSettings|Enable merge trains
.
"
msgid "ProjectSettings|Enable merge trains"
msgstr ""
msgstr ""
msgid "ProjectSettings|Enable merged results pipelines"
msgid "ProjectSettings|Enable merged results pipelines"
...
...
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