diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-12 12:09:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-12 12:09:06 +0300 |
| commit | 3159925155a86dfd41000c1467576927c18c8f58 (patch) | |
| tree | d9c4673de198ac20e4e310ad299636649e47d2a8 /app/views/projects/_merge_request_squash_options_settings.html.haml | |
| parent | 8ccbb53e68d2830e766e1cae4e9d158840d115b6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/_merge_request_squash_options_settings.html.haml')
| -rw-r--r-- | app/views/projects/_merge_request_squash_options_settings.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/_merge_request_squash_options_settings.html.haml b/app/views/projects/_merge_request_squash_options_settings.html.haml index a5dbfeb16d8..61ffd4814f1 100644 --- a/app/views/projects/_merge_request_squash_options_settings.html.haml +++ b/app/views/projects/_merge_request_squash_options_settings.html.haml @@ -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' |