diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-29 11:34:18 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-29 11:34:18 +0000 |
| commit | 4a1df710f80c84ae560270bd96845827d5f7b335 (patch) | |
| tree | 018628ae307a8c7e8f9b536965f111ce09a3bed4 | |
| parent | 70b29c3576f646371c3a5bee312b921a3053fb70 (diff) | |
| parent | d5b1c58e26ec7245c372bd147fed6f497337e63f (diff) | |
| download | gitlab-ce-4a1df710f80c84ae560270bd96845827d5f7b335.tar.gz | |
Merge branch 'mr-wip-text' into 'master'
Shorten merge request WIP text.
See merge request !741
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/_issuable_form.html.haml | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index 452fe553b00..43788f5c4d3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.12.0 (unreleased) + - Shorten merge request WIP text. - Refactor permission checks with issues and merge requests project settings (Stan Hu) - Fix Markdown preview not working in Edit Milestone page (Stan Hu) - Fix Zen Mode not closing with ESC key (Stan Hu) diff --git a/app/views/projects/_issuable_form.html.haml b/app/views/projects/_issuable_form.html.haml index 2292aaaa214..c85da8eff98 100644 --- a/app/views/projects/_issuable_form.html.haml +++ b/app/views/projects/_issuable_form.html.haml @@ -15,11 +15,11 @@ - if issuable.is_a?(MergeRequest) %p.help-block - if issuable.work_in_progress? - This merge request is marked a <strong>Work In Progress</strong>. - When it's ready, remove the <code>WIP</code> prefix from the title to allow it to be accepted. + 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. - else - To prevent this merge request from being accepted before it's ready, - mark it a <strong>Work In Progress</strong> by starting the title with <code>[WIP]</code> or <code>WIP:</code>. + 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. .form-group.issuable-description = f.label :description, 'Description', class: 'control-label' .col-sm-10 |