Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2014-10-02 10:46:56 +0400
committerMarin Jankovski <maxlazio@gmail.com>2014-10-02 10:46:56 +0400
commit51bc636eb34934747f7808b2fc0cd59e9cb8e6b6 (patch)
treec624f9c4f2b476cb159dd8f4d346899164b6eab3 /app/views/projects/merge_requests
parent630dadd9ae83faae282a176e09d3d4be1f0d0511 (diff)
parentec7339e6f82c4c818a738d3b7f1a20367c959913 (diff)
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'app/views/projects/merge_requests')
-rw-r--r--app/views/projects/merge_requests/show/_mr_accept.html.haml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml
index d7d5f970c95..88cc8e17fa6 100644
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml
@@ -28,7 +28,8 @@
= render 'shared/commit_message_container', {textarea: text_area_tag(:merge_commit_message,
@merge_request.merge_commit_message, class: "form-control js-gfm-input", rows: 14, required: true)}
%p.hint
- The recommended maximum line length is 52 characters for the first line and 72 characters for all following lines.
+ Try to keep the first line under 52 characters
+ and the others under 72.
.accept-group
.pull-left