Skip to content

G
gitlab-ce
Commit e928f65e authored by Marcin Sedlak-Jakubowski's avatar Marcin Sedlak-Jakubowski
Browse files
Options

Review merge request project settings 

Including maintainer review commits:

Fix variables names in HAML templates
Regenerate the locales file
Add context to locales phrases
Bring back the form area
Fix disable_merge_trains_setting spec
Remove incorrect prefix from some i18n strings
parent 3a172309
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 104 deletions
app/views/projects/_merge_request_merge_checks_settings.html.haml
View file @ e928f65e
......@@ -2,26 +2,23 @@
.form-group
%b= s_('ProjectSettings|Merge checks')
%p.text-secondary= s_('ProjectSettings|These checks must pass before merge requests can be merged')
%p.text-secondary= s_('ProjectSettings|These checks must pass before merge requests can be merged.')
.form-check.mb-2.builds-feature
= form.check_box :only_allow_merge_if_pipeline_succeeds, class: 'form-check-input'
= form.label :only_allow_merge_if_pipeline_succeeds, class: 'form-check-label' do
= s_('ProjectSettings|Pipelines must succeed')
.text-secondary
= s_('ProjectSettings|Pipelines need to be configured to enable this feature.')
= link_to sprite_icon('question-o'),
help_page_path('ci/merge_request_pipelines/index.md',
anchor: 'pipelines-for-merge-requests'),
target: '_blank'
- configuring_pipelines_for_merge_requests_help_link_url = help_page_path('ci/merge_request_pipelines/index.md', anchor: 'configuring-pipelines-for-merge-requests')
- configuring_pipelines_for_merge_requests_help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: configuring_pipelines_for_merge_requests_help_link_url }
= s_('ProjectSettings|To enable this feature, configure pipelines. %{link_start}How to configure pipelines for merge requests?%{link_end}').html_safe % { link_start: configuring_pipelines_for_merge_requests_help_link_start, link_end: '</a>'.html_safe }
.form-check.mb-2
.gl-pl-6
= form.check_box :allow_merge_on_skipped_pipeline, class: 'form-check-input'
= form.label :allow_merge_on_skipped_pipeline, class: 'form-check-label' do
= s_('ProjectSettings|Skipped pipelines are considered successful')
.text-secondary
= s_('ProjectSettings|This introduces the risk of merging changes that will not pass the pipeline.')
= s_('ProjectSettings|Introduces the risk of merging changes that do not pass the pipeline.')
.form-check.mb-2
= form.check_box :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-input', data: { qa_selector: 'allow_merge_if_all_discussions_are_resolved_checkbox' }
= form.label :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-label' do
= s_('ProjectSettings|All discussions must be resolved')
= render_if_exists 'projects/merge_request_merge_checks_jira_enforcement', form: form, project: @project
app/views/projects/_merge_request_merge_method_settings.html.haml
View file @ e928f65e
......@@ -2,32 +2,32 @@
.form-group
%b= s_('ProjectSettings|Merge method')
%p.text-secondary= s_('ProjectSettings|This will dictate the commit history when you merge a merge request')
%p.text-secondary= s_('ProjectSettings|Determine what happens to the commit history when you merge a merge request.')
.form-check.mb-2
= form.radio_button :merge_method, :merge, class: "js-merge-method-radio form-check-input"
= label_tag :project_merge_method_merge, class: 'form-check-label' do
= s_('ProjectSettings|Merge commit')
.text-secondary
= s_('ProjectSettings|Every merge creates a merge commit')
= s_('ProjectSettings|Every merge creates a merge commit.')
.form-check.mb-2
= form.radio_button :merge_method, :rebase_merge, class: "js-merge-method-radio form-check-input"
= label_tag :project_merge_method_rebase_merge, class: 'form-check-label' do
= s_('ProjectSettings|Merge commit with semi-linear history')
.text-secondary
= s_('ProjectSettings|Every merge creates a merge commit')
= s_('ProjectSettings|Every merge creates a merge commit.')
%br
= s_('ProjectSettings|Fast-forward merges only')
= s_('ProjectSettings|Fast-forward merges only.')
%br
= s_('ProjectSettings|When conflicts arise the user is given the option to rebase')
= s_('ProjectSettings|When there is a merge conflict, the user is given the option to rebase.')
.form-check.mb-2
= form.radio_button :merge_method, :ff, class: "js-merge-method-radio form-check-input", data: { qa_selector: 'merge_ff_radio_button' }
= label_tag :project_merge_method_ff, class: 'form-check-label' do
= s_('ProjectSettings|Fast-forward merge')
.text-secondary
= s_('ProjectSettings|No merge commits are created')
= s_('ProjectSettings|No merge commits are created.')
%br
= s_('ProjectSettings|Fast-forward merges only')
= s_('ProjectSettings|Fast-forward merges only.')
%br
= s_('ProjectSettings|When conflicts arise the user is given the option to rebase')
= s_('ProjectSettings|When there is a merge conflict, the user is given the option to rebase.')
app/views/projects/_merge_request_merge_options_settings.html.haml
View file @ e928f65e
......@@ -2,7 +2,7 @@
.form-group#project-merge-options{ data: { project_full_path: @project.full_path } }
%b= s_('ProjectSettings|Merge options')
%p.text-secondary= s_('ProjectSettings|Additional merge request capabilities that influence how and when merges will be performed')
%p.text-secondary= s_('ProjectSettings|Additional settings that influence how and when merges are done.')
= render_if_exists 'projects/merge_pipelines_settings', form: form
= render_if_exists 'projects/merge_trains_settings', form: form
.form-check.mb-2
......@@ -12,10 +12,10 @@
.form-check.mb-2
= form.check_box :printing_merge_request_link_enabled, class: 'form-check-input'
= form.label :printing_merge_request_link_enabled, class: 'form-check-label' do
= s_('ProjectSettings|Show link to create/view merge request when pushing from the command line')
= s_('ProjectSettings|Show link to create or view a merge request when pushing from the command line')
.form-check.mb-2
= form.check_box :remove_source_branch_after_merge, class: 'form-check-input'
= form.label :remove_source_branch_after_merge, class: 'form-check-label' do
= s_("ProjectSettings|Enable 'Delete source branch' option by default")
= s_('ProjectSettings|Enable "Delete source branch" option by default')
.descr.text-secondary
= s_('ProjectSettings|Existing merge requests and protected branches are not affected')
= s_('ProjectSettings|Existing merge requests and protected branches are not affected.')
app/views/projects/_merge_request_merge_suggestions_settings.html.haml
View file @ e928f65e
......@@ -3,15 +3,13 @@
.form-group
%b= s_('ProjectSettings|Merge suggestions')
%p.text-secondary
= s_('ProjectSettings|The commit message used to apply merge request suggestions')
= link_to sprite_icon('question-o'),
help_page_path('user/discussions/index.md',
anchor: 'configure-the-commit-message-for-applied-suggestions'),
target: '_blank'
- configure_the_commit_message_for_applied_suggestions_help_link_url = help_page_path('user/discussions/index.md', anchor: 'configure-the-commit-message-for-applied-suggestions')
- configure_the_commit_message_for_applied_suggestions_help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: configure_the_commit_message_for_applied_suggestions_help_link_url }
= s_('ProjectSettings|The commit message used when applying merge request suggestions. %{link_start}Learn more about suggestions.%{link_end}').html_safe % { link_start: configure_the_commit_message_for_applied_suggestions_help_link_start, link_end: '</a>'.html_safe }
.mb-2
= form.text_field :suggestion_commit_message, class: 'form-control gl-form-input mb-2', placeholder: Gitlab::Suggestions::CommitMessage::DEFAULT_SUGGESTION_COMMIT_MESSAGE
= form.text_field :suggestion_commit_message, class: 'form-control mb-2', placeholder: Gitlab::Suggestions::CommitMessage::DEFAULT_SUGGESTION_COMMIT_MESSAGE
%p.form-text.text-muted
= s_('ProjectSettings|The variables GitLab supports:')
= s_('ProjectSettings|Supported variables:')
- Gitlab::Suggestions::CommitMessage::PLACEHOLDERS.keys.each do |placeholder|
%code
= "%{#{placeholder}}".html_safe
app/views/projects/_merge_request_squash_options_settings.html.haml
View file @ e928f65e
......@@ -4,7 +4,7 @@
.form-group
%b= s_('ProjectSettings|Squash commits when merging')
%p.text-secondary
= s_('ProjectSettings|Set the default behavior and availability of this option in merge requests. Changes made are also applied to existing merge requests.')
= s_('ProjectSettings|Set the default behavior of this option in merge requests. Changes to this are also applied to existing merge requests.')
= link_to "What is squashing?",
help_page_path('user/project/merge_requests/squash_and_merge.md'),
target: '_blank'
......
changelogs/unreleased/msj-settings-merge-requests.yml 0 → 100644
View file @ e928f65e
---
title: Updated UI text to match style guidelines
merge_request: 50383
author:
type: fixed
doc/user/project/description_templates.md
View file @ e928f65e
......@@ -20,7 +20,7 @@ Every GitLab project can define its own set of description templates as they
are added to the root directory of a GitLab project's repository.
Description templates must be written in [Markdown](../markdown.md) and stored
in your project's repository under a directory named `.gitlab`. Only the
in your project's repository in the `.gitlab` directory. Only the
templates of the default branch are taken into account.
To learn how to create templates for various file types in groups, visit
......@@ -28,10 +28,14 @@ To learn how to create templates for various file types in groups, visit
## Use cases
These are some situations when you might find description templates useful:
- You can create issues and merge request templates for different
stages of your workflow, for example, feature proposal, feature improvement, or a bug report.
- Add a template to be used in every issue for a specific project,
giving instructions and guidelines, requiring for information specific to that subject.
For example, if you have a project for tracking new blog posts, you can require the
title, outlines, author name, author social media information, and so on.
title, outlines, author name, and author social media information.
- Following the previous example, you can make a template for every MR submitted
with a new blog post, requiring information about the post date, front matter data,
images guidelines, link to the related issue, reviewer name, and so on.
......@@ -130,21 +134,23 @@ with access" or "Only Project Members" in your project's **Settings / Visibility
template text areas don't show. This is the default behavior, so in most cases
you should be fine.
To set a default description template for merge requests:
1. Go to your project's **Settings**.
1. Click **Expand** under the **Merge requests** header.
1. Select **Expand** under the **Merge requests** header.
1. Fill in the **Default description template for merge requests** text area.
1. Click **Expand** under **Default issue template**.
1. Fill in the **Default description template for issues** text area.
Since GitLab merge request and issues support [Markdown](../markdown.md), you can use it to format
headings, lists, and so on.
1. Select **Save changes**.
To set a default description template for issues:
![Default merge request description templates](img/description_templates_merge_request_settings.png)
1. Select **Expand** under **Default issue template**.
1. Fill in the **Default description template for issues** text area.
![Default issue description templates](img/description_templates_issue_settings.png)
Because GitLab merge request and issues support [Markdown](../markdown.md), you can use it to format
headings, lists, and so on.
After you add the description, hit **Save changes** for the settings to take
effect. Now, every time a new merge request or issue is created, it is
pre-filled with the text you entered in the template(s).
Now, every time a new merge request or issue is created, it's pre-filled with the text you entered
in the templates.
[GitLab versions 13.10 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/885)
provide `issues_template` and `merge_requests_template` attributes in the
......@@ -152,15 +158,16 @@ provide `issues_template` and `merge_requests_template` attributes in the
## Description template example
We make use of description templates for issues and merge requests in the GitLab project.
For some examples, refer to the [`.gitlab` folder](https://gitlab.com/gitlab-org/gitlab/tree/master/.gitlab).
We use description templates for issues and merge requests in the
[`.gitlab` folder](https://gitlab.com/gitlab-org/gitlab/tree/master/.gitlab) of the
GitLab project, which you can refer to for some examples.
NOTE:
It's possible to use [quick actions](quick_actions.md) in description templates to quickly add
labels, assignees, and milestones. The quick actions are only executed if the user submitting
the issue or merge request has the permissions to perform the relevant actions.
Here is an example of a Bug report template:
Here is an example of a bug report template:
```markdown
## Summary
......
ee/app/views/projects/_merge_pipelines_settings.html.haml
View file @ e928f65e
......@@ -3,11 +3,8 @@
.form-check.builds-feature
= form.check_box :merge_pipelines_enabled, class: 'form-check-input js-merge-options-merge-pipelines', data: { qa_selector: 'merged_results_pipeline_checkbox' }
= form.label :merge_pipelines_enabled, class: 'form-check-label' do
= s_('ProjectSettings|Enable merged results pipelines.')
= s_('ProjectSettings|Enable merged results pipelines')
.text-secondary.mb-2
= s_('ProjectSettings|If pipelines for merge requests are enabled in the CI/CD configuration file, pipelines validate the combined results of the source and target branches.')
= link_to sprite_icon('question-o'),
help_page_path('ci/merge_request_pipelines/index.md',
anchor: 'configuring-pipelines-for-merge-requests'),
target: '_blank',
rel: 'noopener noreferer'
- configuring_pipelines_for_merge_requests_help_link_url = help_page_path('ci/merge_request_pipelines/index', anchor: 'configuring-pipelines-for-merge-requests')
- configuring_pipelines_for_merge_requests_help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: configuring_pipelines_for_merge_requests_help_link_url }
= s_('ProjectSettings|When pipelines for merge requests are enabled in the CI/CD configuration file, pipelines validate the combined results of the source and target branches. %{link_start}How to configure pipelines for merge requests?%{link_end}').html_safe % { link_start: configuring_pipelines_for_merge_requests_help_link_start, link_end: '</a>'.html_safe }
ee/app/views/projects/_merge_request_settings.html.haml
View file @ e928f65e
......@@ -12,10 +12,15 @@
- if @project.feature_available?(:issuable_default_templates)
.form-group
= form.label :merge_requests_template, class: 'label-bold' do
= _('Default description template for merge requests')
= link_to sprite_icon('question-o'), help_page_path('user/project/description_templates'), target: '_blank'
%b= _('Default description template for merge requests')
%p.text-secondary
= s_('ProjectSettings|Used for every new merge request.')
- create_a_merge_request_template_help_link_url = help_page_path('user/project/description_templates', anchor: 'create-a-merge-request-template')
- create_a_merge_request_templates_elp_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: create_a_merge_request_template_help_link_url }
= s_('ProjectSettings|%{link_start}What are description templates?%{link_end}').html_safe % { link_start: create_a_merge_request_templates_elp_link_start, link_end: '</a>'.html_safe }
= form.text_area :merge_requests_template, class: "form-control", rows: 3, data: { qa_selector: 'default_merge_request_template_field' }
.text-secondary
- link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/markdown') }
= _('Description parsed with %{link_start}GitLab Flavored Markdown%{link_end}').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
ee/app/views/projects/_merge_trains_settings.html.haml
View file @ e928f65e
......@@ -6,9 +6,6 @@
= form.label :merge_trains_enabled, class: 'form-check-label' do
= s_('ProjectSettings|Enable merge trains.')
.text-secondary.mb-2
= s_('ProjectSettings|When approved for merge, merge requests are queued and pipelines validate the combined results of the source and target branches before merge.')
= link_to sprite_icon('question-o'),
help_page_path('ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md',
anchor: 'merge-trains'),
target: '_blank',
rel: 'noopener noreferer'
- 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 }
= s_('ProjectSettings|Merge requests approved for merge are queued, and pipelines validate the combined results of the source and target branches before merge. %{link_start}What are merge trains?%{link_end}').html_safe % { link_start: merge_trains_help_link_start, link_end: '</a>'.html_safe }
ee/app/views/shared/promotions/_promote_mr_features.html.haml
View file @ e928f65e
- if show_promotions? && show_callout?('promote_mr_features_dismissed') && !@project.feature_available?(:merge_request_approvers)
.user-callout.promotion-callout.append-bottom-20.js-mr-approval-callout#promote_mr_features{ data: { uid: 'promote_mr_features_dismissed' } }
.bordered-box.content-block
%button.btn.btn-default.close.js-close-callout{ type: 'button', 'aria-label' => _('Dismiss Merge Request promotion') }
%button.btn.btn-default.close.js-close-callout{ type: 'button', 'aria-label' => _('Dismiss merge request promotion') }
= sprite_icon('close', size: 16, css_class: 'dismiss-icon')
.user-callout-copy
%h4
- if Gitlab::CurrentSettings.should_check_namespace_plan?
= _('Upgrade your plan to improve Merge Requests.')
= _('Upgrade your plan to improve merge requests.')
- else
= _('Improve Merge Requests and customer support with GitLab Enterprise Edition.')
= _('Improve merge requests and customer support with GitLab Enterprise Edition.')
%ul
- unless @project.feature_available?(:merge_request_approvers)
%li
= link_to _('Merge Request Approvals'), help_page_path('user/project/merge_requests/merge_request_approvals.md'), target: '_blank'
= link_to _('Merge request approvals'), help_page_path('user/project/merge_requests/merge_request_approvals.md'), target: '_blank'
%p
= _('Merge request approvals allow you to set the number of necessary approvals and predefine a list of approvers that will need to approve every merge request in a project.')
= _('Set the number of necessary approvals and define a list of approvers needed for every merge request in a project.')
= render 'shared/promotions/promotion_link_project'
ee/spec/features/projects/settings/disable_merge_trains_setting_spec.rb
View file @ e928f65e
......@@ -62,7 +62,7 @@ RSpec.describe 'Disable Merge Trains Setting', :js do
end
it 'unchecking merge pipelines checkbox disables merge trains checkbox' do
uncheck('Enable merged results pipelines.')
uncheck('Enable merged results pipelines')
expect(find('#project_merge_pipelines_enabled')).not_to be_checked
expect(find('#project_merge_trains_enabled')).to be_disabled
......@@ -70,7 +70,7 @@ RSpec.describe 'Disable Merge Trains Setting', :js do
it 'unchecking merge pipelines checkbox unchecks merge trains checkbox if it was previously checked' do
check('Enable merge trains.')
uncheck('Enable merged results pipelines.')
uncheck('Enable merged results pipelines')
expect(find('#project_merge_pipelines_enabled')).not_to be_checked
expect(find('#project_merge_trains_enabled')).to be_disabled
......@@ -88,14 +88,14 @@ RSpec.describe 'Disable Merge Trains Setting', :js do
include_examples 'loads correct checkbox state'
it 'checking merge pipelines checkbox enables merge trains checkbox' do
check('Enable merged results pipelines.')
check('Enable merged results pipelines')
expect(find('#project_merge_pipelines_enabled')).to be_checked
expect(find('#project_merge_trains_enabled')).not_to be_disabled
end
it 'checking merge pipelines checkbox should leave merge trains checkbox unchecked' do
check('Enable merged results pipelines.')
check('Enable merged results pipelines')
expect(find('#project_merge_pipelines_enabled')).to be_checked
expect(find('#project_merge_trains_enabled')).not_to be_checked
......@@ -112,7 +112,7 @@ RSpec.describe 'Disable Merge Trains Setting', :js do
include_examples 'loads correct checkbox state'
it 'unchecking merge pipelines checkbox disables and unchecks merge trains checkbox' do
uncheck('Enable merged results pipelines.')
uncheck('Enable merged results pipelines')
expect(find('#project_merge_pipelines_enabled')).not_to be_checked
expect(find('#project_merge_trains_enabled')).to be_disabled
......
ee/spec/features/projects/settings/user_manages_merge_pipelines_spec.rb
View file @ e928f65e
......@@ -23,7 +23,7 @@ RSpec.describe 'User manages merge pipelines option', :js do
before do
visit edit_project_path(project)
check('Enable merged results pipelines.')
check('Enable merged results pipelines')
end
it 'sees enabled merge pipeline checkbox' do
......
ee/spec/features/projects/settings/user_manages_merge_trains_spec.rb
View file @ e928f65e
......@@ -26,7 +26,7 @@ RSpec.describe 'User manages merge trains option', :js do
visit edit_project_path(project)
wait_for_requests
check('Enable merge trains.')
check('Enable merge trains')
end
it 'sees enabled merge trains checkbox' do
......
ee/spec/features/promotion_spec.rb
View file @ e928f65e
......@@ -24,7 +24,7 @@ RSpec.describe 'Promotions', :js do
it 'appears in project edit page' do
visit edit_project_path(project)
expect(find('#promote_mr_features')).to have_content 'Improve Merge Requests'
expect(find('#promote_mr_features')).to have_content 'Improve merge requests'
end
it 'does not show when cookie is set' do
......
locale/gitlab.pot
View file @ e928f65e
......@@ -10853,6 +10853,9 @@ msgstr ""
msgid "Dismiss Value Stream Analytics introduction box"
msgstr ""
msgid "Dismiss merge request promotion"
msgstr ""
msgid "Dismiss selected"
msgstr ""
......@@ -15653,10 +15656,10 @@ msgid_plural "Importing %d repositories"
msgstr[0] ""
msgstr[1] ""
msgid "Improve Merge Requests and customer support with GitLab Enterprise Edition."
msgid "Improve customer support with Service Desk"
msgstr ""
msgid "Improve customer support with Service Desk"
msgid "Improve merge requests and customer support with GitLab Enterprise Edition."
msgstr ""
msgid "Improve search with Advanced Search and GitLab Enterprise Edition."
......@@ -18941,9 +18944,6 @@ msgstr ""
msgid "Merge Request Analytics"
msgstr ""
msgid "Merge Request Approvals"
msgstr ""
msgid "Merge Request Commits"
msgstr ""
......@@ -19001,9 +19001,6 @@ msgstr ""
msgid "Merge request approvals"
msgstr ""
msgid "Merge request approvals allow you to set the number of necessary approvals and predefine a list of approvers that will need to approve every merge request in a project."
msgstr ""
msgid "Merge request dependencies"
msgstr ""
......@@ -23714,7 +23711,10 @@ msgstr ""
msgid "ProjectService|To set up this service:"
msgstr ""
msgid "ProjectSettings|Additional merge request capabilities that influence how and when merges will be performed"
msgid "ProjectSettings|%{link_start}What are description templates?%{link_end}"
msgstr ""
msgid "ProjectSettings|Additional settings that influence how and when merges are done."
msgstr ""
msgid "ProjectSettings|All discussions must be resolved"
......@@ -23768,25 +23768,28 @@ msgstr ""
msgid "ProjectSettings|Customize this project's badges."
msgstr ""
msgid "ProjectSettings|Determine what happens to the commit history when you merge a merge request."
msgstr ""
msgid "ProjectSettings|Disable email notifications"
msgstr ""
msgid "ProjectSettings|Do not allow"
msgstr ""
msgid "ProjectSettings|Enable 'Delete source branch' option by default"
msgid "ProjectSettings|Enable \"Delete source branch\" option by default"
msgstr ""
msgid "ProjectSettings|Enable merge trains."
msgstr ""
msgid "ProjectSettings|Enable merged results pipelines."
msgid "ProjectSettings|Enable merged results pipelines"
msgstr ""
msgid "ProjectSettings|Encourage"
msgstr ""
msgid "ProjectSettings|Every merge creates a merge commit"
msgid "ProjectSettings|Every merge creates a merge commit."
msgstr ""
msgid "ProjectSettings|Every project can have its own space to store its Docker images"
......@@ -23798,7 +23801,7 @@ msgstr ""
msgid "ProjectSettings|Everyone"
msgstr ""
msgid "ProjectSettings|Existing merge requests and protected branches are not affected"
msgid "ProjectSettings|Existing merge requests and protected branches are not affected."
msgstr ""
msgid "ProjectSettings|Failed to protect the tag"
......@@ -23810,7 +23813,7 @@ msgstr ""
msgid "ProjectSettings|Fast-forward merge"
msgstr ""
msgid "ProjectSettings|Fast-forward merges only"
msgid "ProjectSettings|Fast-forward merges only."
msgstr ""
msgid "ProjectSettings|Forks"
......@@ -23822,10 +23825,10 @@ msgstr ""
msgid "ProjectSettings|Global"
msgstr ""
msgid "ProjectSettings|If pipelines for merge requests are enabled in the CI/CD configuration file, pipelines validate the combined results of the source and target branches."
msgid "ProjectSettings|Internal"
msgstr ""
msgid "ProjectSettings|Internal"
msgid "ProjectSettings|Introduces the risk of merging changes that do not pass the pipeline."
msgstr ""
msgid "ProjectSettings|Issues"
......@@ -23858,10 +23861,13 @@ msgstr ""
msgid "ProjectSettings|Merge requests"
msgstr ""
msgid "ProjectSettings|Merge requests approved for merge are queued, and pipelines validate the combined results of the source and target branches before merge. %{link_start}What are merge trains?%{link_end}"
msgstr ""
msgid "ProjectSettings|Merge suggestions"
msgstr ""
msgid "ProjectSettings|No merge commits are created"
msgid "ProjectSettings|No merge commits are created."
msgstr ""
msgid "ProjectSettings|Note: the container registry is always visible when a project is public"
......@@ -23891,9 +23897,6 @@ msgstr ""
msgid "ProjectSettings|Pipelines must succeed"
msgstr ""
msgid "ProjectSettings|Pipelines need to be configured to enable this feature."
msgstr ""
msgid "ProjectSettings|Private"
msgstr ""
......@@ -23924,7 +23927,7 @@ msgstr ""
msgid "ProjectSettings|Security & Compliance for this project"
msgstr ""
msgid "ProjectSettings|Set the default behavior and availability of this option in merge requests. Changes made are also applied to existing merge requests."
msgid "ProjectSettings|Set the default behavior of this option in merge requests. Changes to this are also applied to existing merge requests."
msgstr ""
msgid "ProjectSettings|Share code with others outside the project."
......@@ -23933,7 +23936,7 @@ msgstr ""
msgid "ProjectSettings|Show default award emojis"
msgstr ""
msgid "ProjectSettings|Show link to create/view merge request when pushing from the command line"
msgid "ProjectSettings|Show link to create or view a merge request when pushing from the command line"
msgstr ""
msgid "ProjectSettings|Skipped pipelines are considered successful"
......@@ -23954,16 +23957,13 @@ msgstr ""
msgid "ProjectSettings|Submit changes to be merged upstream."
msgstr ""
msgid "ProjectSettings|The commit message used to apply merge request suggestions"
msgid "ProjectSettings|Supported variables:"
msgstr ""
msgid "ProjectSettings|The variables GitLab supports:"
msgid "ProjectSettings|The commit message used when applying merge request suggestions. %{link_start}Learn more about suggestions.%{link_end}"
msgstr ""
msgid "ProjectSettings|These checks must pass before merge requests can be merged"
msgstr ""
msgid "ProjectSettings|This introduces the risk of merging changes that will not pass the pipeline."
msgid "ProjectSettings|These checks must pass before merge requests can be merged."
msgstr ""
msgid "ProjectSettings|This setting is applied on the server level and can be overridden by an admin."
......@@ -23975,12 +23975,15 @@ msgstr ""
msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin."
msgstr ""
msgid "ProjectSettings|This will dictate the commit history when you merge a merge request"
msgid "ProjectSettings|To enable this feature, configure pipelines. %{link_start}How to configure pipelines for merge requests?%{link_end}"
msgstr ""
msgid "ProjectSettings|Transfer project"
msgstr ""
msgid "ProjectSettings|Used for every new merge request."
msgstr ""
msgid "ProjectSettings|Users can copy the repository to a new project."
msgstr ""
......@@ -24008,10 +24011,10 @@ msgstr ""
msgid "ProjectSettings|What are badges?"
msgstr ""
msgid "ProjectSettings|When approved for merge, merge requests are queued and pipelines validate the combined results of the source and target branches before merge."
msgid "ProjectSettings|When pipelines for merge requests are enabled in the CI/CD configuration file, pipelines validate the combined results of the source and target branches. %{link_start}How to configure pipelines for merge requests?%{link_end}"
msgstr ""
msgid "ProjectSettings|When conflicts arise the user is given the option to rebase"
msgid "ProjectSettings|When there is a merge conflict, the user is given the option to rebase."
msgstr ""
msgid "ProjectSettings|Wiki"
......@@ -27491,6 +27494,9 @@ msgstr ""
msgid "Set the milestone to %{milestone_reference}."
msgstr ""
msgid "Set the number of necessary approvals and define a list of approvers needed for every merge request in a project."
msgstr ""
msgid "Set the timeout in seconds to send a secondary node status to the primary and IPs allowed for the secondary nodes."
msgstr ""
......@@ -32344,7 +32350,7 @@ msgstr ""
msgid "Upgrade your plan to enable this feature of the Jira Integration."
msgstr ""
msgid "Upgrade your plan to improve Merge Requests."
msgid "Upgrade your plan to improve merge requests."
msgstr ""
msgid "Upload"
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7