diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-17 09:10:26 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-17 09:10:26 +0000 |
commit | 170926ba283d7785f2fc53f05d4adc0df7617325 (patch) | |
tree | a6918d2e0bbb37d9670a9fc4cf97dcff5c1c0f76 /app/views/shared/issuable/form/_title.html.haml | |
parent | 58e2ed53aa00b26eb1c07e235adc6f0a0535faf1 (diff) | |
download | gitlab-ce-170926ba283d7785f2fc53f05d4adc0df7617325.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared/issuable/form/_title.html.haml')
-rw-r--r-- | app/views/shared/issuable/form/_title.html.haml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/views/shared/issuable/form/_title.html.haml b/app/views/shared/issuable/form/_title.html.haml index 94d0c395fa6..561ca0afd60 100644 --- a/app/views/shared/issuable/form/_title.html.haml +++ b/app/views/shared/issuable/form/_title.html.haml @@ -5,11 +5,8 @@ - div_class = no_issuable_templates ? 'col-sm-10' : 'col-sm-7 col-lg-8' - toggle_wip_link_start = '<a href="" class="js-toggle-wip">' - toggle_wip_link_end = '</a>' -- draft_snippet = '<code>Draft:</code>'.html_safe -- wip_snippet = '<code>WIP:</code>'.html_safe -- draft_or_wip_snippet = '<code>Draft/WIP</code>'.html_safe -- add_wip_text = (_('%{link_start}Start the title with %{draft_snippet} or %{wip_snippet}%{link_end} to prevent a merge request that is a work in progress from being merged before it\'s ready.') % { link_start: toggle_wip_link_start, link_end: toggle_wip_link_end, draft_snippet: draft_snippet, wip_snippet: wip_snippet } ).html_safe -- remove_wip_text = (_('%{link_start}Remove the %{draft_or_wip_snippet} prefix%{link_end} from the title to allow this merge request to be merged when it\'s ready.' ) % { link_start: toggle_wip_link_start, link_end: toggle_wip_link_end, draft_or_wip_snippet: draft_or_wip_snippet } ).html_safe +- add_wip_text = (_('%{link_start}Start the title with %{draft_snippet}%{link_end} to prevent a merge request that is a work in progress from being merged before it\'s ready.') % { link_start: toggle_wip_link_start, link_end: toggle_wip_link_end, draft_snippet: '<code>Draft:</code>'.html_safe } ).html_safe +- remove_wip_text = (_('%{link_start}Remove the %{draft_snippet} prefix%{link_end} from the title to allow this merge request to be merged when it\'s ready.' ) % { link_start: toggle_wip_link_start, link_end: toggle_wip_link_end, draft_snippet: '<code>Draft</code>'.html_safe } ).html_safe %div{ class: div_class } = form.text_field :title, required: true, maxlength: 255, autofocus: true, |