From d5b1c58e26ec7245c372bd147fed6f497337e63f Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 29 May 2015 11:36:44 +0200 Subject: Shorten merge request WIP text. --- CHANGELOG | 1 + app/views/projects/_issuable_form.html.haml | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d208812af63..5d26b148cab 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 Work In Progress. - When it's ready, remove the WIP prefix from the title to allow it to be accepted. + Remove the WIP prefix from the title to allow this + Work In Progress 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 Work In Progress by starting the title with [WIP] or WIP:. + Start the title with [WIP] or WIP: to prevent a + Work In Progress merge request from being accepted before it's ready. .form-group.issuable-description = f.label :description, 'Description', class: 'control-label' .col-sm-10 -- cgit v1.2.1