diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-03 14:38:33 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-03 14:38:33 +0300 |
| commit | 43217dd5ddcb7557ea0c7300c6a02253f1b99d7d (patch) | |
| tree | b5a66c12afcc2341cfb7757b5895a0c4145d89e8 /app/views/projects/blob | |
| parent | 8188427e83f55df1f9750786c2a457976d4ebca7 (diff) | |
| parent | 4ebe718d69bc4a619f829ab54a81a6ed03cd56c1 (diff) | |
| download | gitlab-ce-43217dd5ddcb7557ea0c7300c6a02253f1b99d7d.tar.gz | |
Merge branch 'cirosantilli-factor-commit-msg-textarea'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/views/projects/edit_tree/show.html.haml
Diffstat (limited to 'app/views/projects/blob')
| -rw-r--r-- | app/views/projects/blob/_remove.html.haml | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/app/views/projects/blob/_remove.html.haml b/app/views/projects/blob/_remove.html.haml index 90659343d97..da84dc4b6cf 100644 --- a/app/views/projects/blob/_remove.html.haml +++ b/app/views/projects/blob/_remove.html.haml @@ -10,13 +10,8 @@ .modal-body = form_tag project_blob_path(@project, @id), method: :delete, class: 'form-horizontal' do - .form-group.commit_message-group - = label_tag 'commit_message', class: "control-label" do - Commit message - .col-sm-10 - = render 'shared/commit_message_container', {textarea: text_area_tag('commit_message', - params[:commit_message], placeholder: "Remove #{@blob.name}", - required: true, rows: 3, class: 'form-control')} + = render 'shared/commit_message_container', params: params, + placeholder: 'Removed this file because...' .form-group .col-sm-2 .col-sm-10 |