diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-09-09 17:11:58 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-09-09 17:11:58 +0300 |
| commit | e0ca2adafda95dbb0476847499d662623ff0b6be (patch) | |
| tree | 6059d5f25fca0021a5da50bec06e4f6e8e6510da /app/views/projects/merge_requests/show | |
| parent | 76a07394547a8df1ac1553ecd52f3e6e2d20a8af (diff) | |
| download | gitlab-ce-e0ca2adafda95dbb0476847499d662623ff0b6be.tar.gz | |
Improve Merge Request form
* added description
* simplified form
* enabled gfm autocomplete
Diffstat (limited to 'app/views/projects/merge_requests/show')
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_box.html.haml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml index c4b614b51da..1f750e22c65 100644 --- a/app/views/projects/merge_requests/show/_mr_box.html.haml +++ b/app/views/projects/merge_requests/show/_mr_box.html.haml @@ -21,6 +21,12 @@ %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone) + - if @merge_request.description.present? + .ui-box-bottom + .wiki + = preserve do + = markdown @merge_request.description + - if @merge_request.closed? .ui-box-bottom.alert-error %span |