root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix selectbox when submit MR from fork to origin 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2014-01-23 10:08:26 +02:00
parent 69ff7657d7
commit ccae561f9b
No known key found for this signature in database
GPG Key ID: 627C5F589F467F17
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/projects/merge_requests_controller.rb
View File

@ -152,6 +152,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@target_project = selected_target_project @target_project = selected_target_project
@target_branches = @target_project.repository.branch_names @target_branches = @target_project.repository.branch_names
@target_branches @target_branches
respond_to do |format|
format.js
end
end end
def ci_status def ci_status

8
app/views/projects/merge_requests/update_branches.js.haml
View File

@ -1,5 +1,9 @@
:plain :plain
$(".target_branch").html("#{escape_javascript(options_for_select(@target_branches))}"); $(".target_branch").html("#{escape_javascript(options_for_select(@target_branches))}");
$(".target_branch").trigger("select2:updated");
$('select.target_branch').select2({
width: 'resolve',
dropdownAutoWidth: true
});
$(".mr_target_commit").html(""); $(".mr_target_commit").html("");
$(".target_branch").trigger("change");