Merge branch 'mr-download-dropdown-alignment' into 'master'
Fixed alignment of download dropdown ## What does this MR do? Correctly aligns the download dropdown on merge requests ## Screenshots (if relevant) ![Screen_Shot_2016-06-14_at_14.47.06](/uploads/9381f25110e5573e56aa5c3f46786df5/Screen_Shot_2016-06-14_at_14.47.06.png) See merge request !4646
This commit is contained in:
commit
280c95fc4a
2 changed files with 3 additions and 2 deletions
|
@ -40,6 +40,7 @@ v 8.9.0 (unreleased)
|
|||
- `git clone https://host/namespace/project` now works, in addition to using the `.git` suffix
|
||||
- Bump nokogiri to 1.6.8
|
||||
- Use gitlab-shell v3.0.0
|
||||
- Fixed alignment of download dropdown in merge requests
|
||||
- Upgrade to jQuery 2
|
||||
- Use Knapsack to evenly distribute tests across multiple nodes
|
||||
- Add `sha` parameter to MR merge API, to ensure only reviewed changes are merged
|
||||
|
|
|
@ -17,11 +17,11 @@
|
|||
= link_to "#modal_merge_info", class: "btn inline btn-grouped btn-sm", "data-toggle" => "modal" do
|
||||
Check out branch
|
||||
|
||||
%span.dropdown
|
||||
%span.dropdown.inline.prepend-left-5
|
||||
%a.btn.btn-sm.dropdown-toggle{ data: {toggle: :dropdown} }
|
||||
Download as
|
||||
%span.caret
|
||||
%ul.dropdown-menu
|
||||
%ul.dropdown-menu.dropdown-menu-align-right
|
||||
%li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch)
|
||||
%li= link_to "Plain Diff", merge_request_path(@merge_request, format: :diff)
|
||||
.normal
|
||||
|
|
Loading…
Reference in a new issue