Commit d5b1c58e authored by Douwe Maan's avatar Douwe Maan

Shorten merge request WIP text.

parent 2f3a11fe
Please view this file on the master branch, on stable branches it's out of date. Please view this file on the master branch, on stable branches it's out of date.
v 7.12.0 (unreleased) v 7.12.0 (unreleased)
- Shorten merge request WIP text.
- Refactor permission checks with issues and merge requests project settings (Stan Hu) - Refactor permission checks with issues and merge requests project settings (Stan Hu)
- Fix Markdown preview not working in Edit Milestone page (Stan Hu) - Fix Markdown preview not working in Edit Milestone page (Stan Hu)
- Fix Zen Mode not closing with ESC key (Stan Hu) - Fix Zen Mode not closing with ESC key (Stan Hu)
......
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
- if issuable.is_a?(MergeRequest) - if issuable.is_a?(MergeRequest)
%p.help-block %p.help-block
- if issuable.work_in_progress? - if issuable.work_in_progress?
This merge request is marked a <strong>Work In Progress</strong>. Remove the <code>WIP</code> prefix from the title to allow this
When it's ready, remove the <code>WIP</code> prefix from the title to allow it to be accepted. <strong>Work In Progress</strong> merge request to be accepted when it's ready.
- else - else
To prevent this merge request from being accepted before it's ready, Start the title with <code>[WIP]</code> or <code>WIP:</code> to prevent a
mark it a <strong>Work In Progress</strong> by starting the title with <code>[WIP]</code> or <code>WIP:</code>. <strong>Work In Progress</strong> merge request from being accepted before it's ready.
.form-group.issuable-description .form-group.issuable-description
= f.label :description, 'Description', class: 'control-label' = f.label :description, 'Description', class: 'control-label'
.col-sm-10 .col-sm-10
......
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