diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-08 21:16:16 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-08 21:24:43 +0200 |
| commit | b8590da02401d8c3666c49277fbd8ae3d71d6dd0 (patch) | |
| tree | 492e76bcfce4ce402999f45063d284a7558f89a3 /app/views/shared/issuable/_form.html.haml | |
| parent | a71bed53e0aceb10b8e97d490a0d0486a8d47e72 (diff) | |
| download | gitlab-ce-b8590da02401d8c3666c49277fbd8ae3d71d6dd0.tar.gz | |
Improve MR merge widget text and UI consistency.
Diffstat (limited to 'app/views/shared/issuable/_form.html.haml')
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index ac8c1936c9e..3489bf3f191 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -16,10 +16,10 @@ %p.help-block - if issuable.work_in_progress? Remove the <code>WIP</code> prefix from the title to allow this - <strong>Work In Progress</strong> merge request to be accepted when it's ready. + <strong>Work In Progress</strong> merge request to be merged when it's ready. - else Start the title with <code>[WIP]</code> or <code>WIP:</code> to prevent a - <strong>Work In Progress</strong> merge request from being accepted before it's ready. + <strong>Work In Progress</strong> merge request from being merged before it's ready. .form-group.issuable-description = f.label :description, 'Description', class: 'control-label' .col-sm-10 |