diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-05-10 13:28:35 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-05-10 13:28:35 +0300 |
| commit | 4453104d75bc85f5dba81bea5ab36e1915964ab1 (patch) | |
| tree | fee5ac94f63793a08734b237e7b8fc981fd1b38f /app | |
| parent | 3af78b5c53d5214e662aa35c6adde53d00f6c51e (diff) | |
| parent | 1026f2ad0982493cb5465404ef4ebe71a0082bc0 (diff) | |
Merge branch '2460-3690-support-multiline-tag-message' into 'master'
Support multi-line tag messages
_Originally opened at !2853 by @clns._
- - -
Tag messages in Git can include a short summary of what changes are included in a release and any other relevant information. So I think GitLab should support multi-line tag messages, both in the "New Tag" interface and when viewing the tag.
Also a non-technical user could use GitLab's interface to create releases, but at the moment this is impossible because he cannot enter a multi-line message. This would've been very handy, otherwise he would need to do it from the command line or other GUI program, which is not something a non-technical user has access to or knows how to do.
This merge request adds support for multi-line tag messages. Below are the impacted screens. Let me know if I should change anything.
This would close #3690 and #2460
See merge request !3833
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/tags/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/tags/show.html.haml | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/views/projects/tags/new.html.haml b/app/views/projects/tags/new.html.haml index b40a6e5cb2d..f9306453297 100644 --- a/app/views/projects/tags/new.html.haml +++ b/app/views/projects/tags/new.html.haml @@ -23,7 +23,7 @@ .form-group = label_tag :message, nil, class: 'control-label' .col-sm-10 - = text_field_tag :message, nil, required: false, tabindex: 3, class: 'form-control' + = text_area_tag :message, nil, required: false, tabindex: 3, class: 'form-control', rows: 5 .help-block Optionally, enter a message to create an annotated tag. %hr .form-group diff --git a/app/views/projects/tags/show.html.haml b/app/views/projects/tags/show.html.haml index 9c916fd02de..9f1424aecc7 100644 --- a/app/views/projects/tags/show.html.haml +++ b/app/views/projects/tags/show.html.haml @@ -19,15 +19,13 @@ %i.fa.fa-trash-o .title %span.item-title= @tag.name - - if @tag.message.present? - %span.light - - = strip_gpg_signature(@tag.message) - if @commit = render 'projects/branches/commit', commit: @commit, project: @project - else Cant find HEAD commit for this tag - + - if @tag.message.present? + %pre.body + = strip_gpg_signature(@tag.message) .append-bottom-default.prepend-top-default - if @release.description.present? |