Commit b9e67aa2 authored by Mike Greiling's avatar Mike Greiling Committed by Sean McGivern

remove right alignment of "modify commit message" toggle

parent 7f7bd276
...@@ -56,11 +56,11 @@ ...@@ -56,11 +56,11 @@
&.right { &.right {
float: right; float: right;
padding-right: 0; padding-right: 0;
}
a { .modify-merge-commit-link {
color: $gl-text-color; color: $gl-text-color;
} }
}
.merge-param-checkbox { .merge-param-checkbox {
margin: 0; margin: 0;
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
= check_box_tag :squash, '1', @merge_request.squash = check_box_tag :squash, '1', @merge_request.squash
Squash commits Squash commits
.accept-control.right .accept-control
- if @project.merge_requests_ff_only_enabled - if @project.merge_requests_ff_only_enabled
Fast-forward merge without a merge commit Fast-forward merge without a merge commit
- else - else
......
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