Commit 4c8666e6 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg

Fix commit message textarea position

parent 96520227
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
= form_for [:merge, @project.namespace.becomes(Namespace), @project, @merge_request], remote: true, method: :post, html: { class: 'accept-mr-form js-requires-input' } do |f| = form_for [:merge, @project.namespace.becomes(Namespace), @project, @merge_request], remote: true, method: :post, html: { class: 'accept-mr-form js-requires-input' } do |f|
= hidden_field_tag :authenticity_token, form_authenticity_token = hidden_field_tag :authenticity_token, form_authenticity_token
.accept-merge-holder.clearfix.js-toggle-container .accept-merge-holder.clearfix.js-toggle-container
.clearfix
.accept-action .accept-action
- if @merge_request.ci_commit && @merge_request.ci_commit.active? - if @merge_request.ci_commit && @merge_request.ci_commit.active?
%span.btn-group %span.btn-group
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
%li %li
= link_to "#", class: "accept_merge_request" do = link_to "#", class: "accept_merge_request" do
= icon('warning fw') = icon('warning fw')
Accept Merge Request Now Merge Immediately
- else - else
= f.button class: "btn btn-create btn-grouped accept_merge_request #{status_class}" do = f.button class: "btn btn-create btn-grouped accept_merge_request #{status_class}" do
Accept Merge Request Accept Merge Request
...@@ -33,7 +34,7 @@ ...@@ -33,7 +34,7 @@
= link_to "#", class: "modify-merge-commit-link js-toggle-button" do = link_to "#", class: "modify-merge-commit-link js-toggle-button" do
= icon('edit') = icon('edit')
Modify commit message Modify commit message
.js-toggle-content.hide.prepend-top-20 .js-toggle-content.hide.prepend-top-default
= render 'shared/commit_message_container', params: params, = render 'shared/commit_message_container', params: params,
text: @merge_request.merge_commit_message, text: @merge_request.merge_commit_message,
rows: 14, hint: true rows: 14, hint: true
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment