Merge branch 'merge-request-default-source-branch-text' into 'master'
Added source branch text to dropdown toggle ## What does this MR do? Previously, the dropdown toggle would default to "Select source branch", this changes that so that it defaults to the branch name and if that doesn't exist, it defaults to "Select source branch" ## Screenshots (if relevant) ![Screen_Shot_2016-06-07_at_12.20.10](/uploads/40d31e21297a99300050cf9f23bd7371/Screen_Shot_2016-06-07_at_12.20.10.png) See merge request !4504
This commit is contained in:
commit
e0f46ef1a5
|
@ -42,6 +42,7 @@ v 8.9.0 (unreleased)
|
||||||
- Use gitlab-shell v3.0.0
|
- Use gitlab-shell v3.0.0
|
||||||
- Fixed alignment of download dropdown in merge requests
|
- Fixed alignment of download dropdown in merge requests
|
||||||
- Upgrade to jQuery 2
|
- Upgrade to jQuery 2
|
||||||
|
- Adds selected branch name to the dropdown toggle
|
||||||
- Use Knapsack to evenly distribute tests across multiple nodes
|
- Use Knapsack to evenly distribute tests across multiple nodes
|
||||||
- Add `sha` parameter to MR merge API, to ensure only reviewed changes are merged
|
- Add `sha` parameter to MR merge API, to ensure only reviewed changes are merged
|
||||||
- Don't allow MRs to be merged when commits were added since the last review / page load
|
- Don't allow MRs to be merged when commits were added since the last review / page load
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
selected: f.object.source_project_id
|
selected: f.object.source_project_id
|
||||||
.merge-request-select.dropdown
|
.merge-request-select.dropdown
|
||||||
= f.hidden_field :source_branch
|
= f.hidden_field :source_branch
|
||||||
= dropdown_toggle "Select source branch", { toggle: "dropdown", field_name: "#{f.object_name}[source_branch]" }, { toggle_class: "js-compare-dropdown js-source-branch" }
|
= dropdown_toggle f.object.source_branch || "Select source branch", { toggle: "dropdown", field_name: "#{f.object_name}[source_branch]" }, { toggle_class: "js-compare-dropdown js-source-branch" }
|
||||||
.dropdown-menu.dropdown-menu-selectable.dropdown-source-branch
|
.dropdown-menu.dropdown-menu-selectable.dropdown-source-branch
|
||||||
= dropdown_title("Select source branch")
|
= dropdown_title("Select source branch")
|
||||||
= dropdown_filter("Search branches")
|
= dropdown_filter("Search branches")
|
||||||
|
|
Loading…
Reference in New Issue