diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-12 16:58:32 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-12 16:58:32 +0000 |
| commit | 1c6a1253899219b84cc9cb8b090a3bfbbd19605e (patch) | |
| tree | 0567ddf344cf6c6373b8efc0a089d1dcbbe7a6e7 | |
| parent | 6643d38f9790404eee17034a6e003beebadaf197 (diff) | |
| parent | 0a089661fd488bf71b7a426441204713200f57ed (diff) | |
| download | gitlab-ce-1c6a1253899219b84cc9cb8b090a3bfbbd19605e.tar.gz | |
Merge branch 'mr_widget_remove_source_branch_checkbox' into 'master'
Mr widget remove source branch checkbox
Fixes #1858
Renamed custom `checkbox` css class for remove source branch checkbox because it was being overwritten on Safari by `checkbox` from bootstrap in `_forms.scss`
After rename, alignment looks corrected
See merge request !1386
| -rw-r--r-- | app/assets/stylesheets/sections/merge_requests.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_accept.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss index 8445b77c1a8..74e1d8beb5a 100644 --- a/app/assets/stylesheets/sections/merge_requests.scss +++ b/app/assets/stylesheets/sections/merge_requests.scss @@ -29,7 +29,7 @@ line-height: 20px; font-weight: bold; - .checkbox { + .remove_source_checkbox { margin: 0; } } 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 dd5f29e5389..11a111e5faa 100644 --- a/app/views/projects/merge_requests/show/_mr_accept.html.haml +++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml @@ -18,7 +18,7 @@ = f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request" - if can_remove_branch?(@merge_request.source_project, @merge_request.source_branch) && !@merge_request.for_fork? .accept-control - = label_tag :should_remove_source_branch, class: "checkbox" do + = label_tag :should_remove_source_branch, class: "remove_source_checkbox" do = check_box_tag :should_remove_source_branch Remove source-branch .accept-control |