diff options
author | Ciro Santilli <ciro.santilli@gmail.com> | 2014-09-27 00:41:17 +0200 |
---|---|---|
committer | Ciro Santilli <ciro.santilli@gmail.com> | 2014-10-02 12:03:30 +0200 |
commit | 3098e7a453c84ac4df1686b8bad6ef8004aca60d (patch) | |
tree | 3ad7bc927d6d18fd74e68a92bb5c935376b43560 /app/views/projects | |
parent | b0349915e2615617aff9c5291f7e305d59ea3992 (diff) | |
download | gitlab-ce-3098e7a453c84ac4df1686b8bad6ef8004aca60d.tar.gz |
Factor commit message textareas.
Diffstat (limited to 'app/views/projects')
-rw-r--r-- | app/views/projects/blob/_remove.html.haml | 8 | ||||
-rw-r--r-- | app/views/projects/edit_tree/show.html.haml | 9 | ||||
-rw-r--r-- | app/views/projects/merge_requests/show/_mr_accept.html.haml | 12 | ||||
-rw-r--r-- | app/views/projects/new_tree/show.html.haml | 11 |
4 files changed, 9 insertions, 31 deletions
diff --git a/app/views/projects/blob/_remove.html.haml b/app/views/projects/blob/_remove.html.haml index 93ffd4463b1..da84dc4b6cf 100644 --- a/app/views/projects/blob/_remove.html.haml +++ b/app/views/projects/blob/_remove.html.haml @@ -10,12 +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: "Removed this file because...", 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 diff --git a/app/views/projects/edit_tree/show.html.haml b/app/views/projects/edit_tree/show.html.haml index 62798b51d82..aca7d874abf 100644 --- a/app/views/projects/edit_tree/show.html.haml +++ b/app/views/projects/edit_tree/show.html.haml @@ -21,13 +21,8 @@ .center %h2 %i.icon-spinner.icon-spin - - .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', '', - placeholder: "Update #{@blob.name}", required: true, rows: 3, class: 'form-control')} + = render 'shared/commit_message_container', params: params, + placeholder: "Update #{@blob.name}" .form-actions = hidden_field_tag 'last_commit', @last_commit = hidden_field_tag 'content', '', id: "file-content" 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 88cc8e17fa6..e2cf2b60234 100644 --- a/app/views/projects/merge_requests/show/_mr_accept.html.haml +++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml @@ -22,15 +22,9 @@ %strong= link_to "modify merge commit message", "#", class: "modify-merge-commit-link js-toggle-button", title: "Modify merge commit message" before accepting merge request .js-toggle-content.hide - .form-group - = label_tag :merge_commit_message, "Commit message", class: 'control-label' - .col-sm-10 - = 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 - Try to keep the first line under 52 characters - and the others under 72. - + = render 'shared/commit_message_container', params: params, + text: @merge_request.merge_commit_message, + rows: 14, hint: true .accept-group .pull-left = f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request" diff --git a/app/views/projects/new_tree/show.html.haml b/app/views/projects/new_tree/show.html.haml index 24d77344fd5..3df1c032ba1 100644 --- a/app/views/projects/new_tree/show.html.haml +++ b/app/views/projects/new_tree/show.html.haml @@ -19,15 +19,8 @@ Encoding .col-sm-10 = select_tag :encoding, options_for_select([ "base64", "text" ], "text"), class: 'form-control' - - .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: 'Add new file', - required: true, rows: 3, class: 'form-control')} - + = render 'shared/commit_message_container', params: params, + placeholder: 'Add new file' .file-holder .file-title %i.icon-file |