diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-31 13:24:38 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-31 13:24:38 +0200 |
| commit | f416b2f5cf228981be5b1c9518fa7312069e0ae1 (patch) | |
| tree | 6d88d9f79b9f094cb47b4f29c2eb685cb91e4961 /app/views/projects/merge_requests/_form.html.haml | |
| parent | 9e181d36ead37ace996c5ec8a25f7639bc308345 (diff) | |
| download | gitlab-ce-f416b2f5cf228981be5b1c9518fa7312069e0ae1.tar.gz | |
Fix bug with merge request branch select
Merge request target branch select is broken if you submit form and have
some errors on page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/projects/merge_requests/_form.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_form.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml index 63ebaadaa80..b4ba127da25 100644 --- a/app/views/projects/merge_requests/_form.html.haml +++ b/app/views/projects/merge_requests/_form.html.haml @@ -13,7 +13,7 @@ = f.select(:source_project_id, [[@merge_request.source_project_path,@merge_request.source_project.id]] , {}, { class: 'source_project select2 span3', disabled: @merge_request.persisted? }) .pull-left - = f.select(:source_branch, @merge_request.source_project.repository.branch_names, { include_blank: "Select branch" }, {class: 'source_branch select2 span2'}) + = f.select(:source_branch, @merge_request.source_branches, { include_blank: "Select branch" }, {class: 'source_branch select2 span2'}) .mr_source_commit.prepend-top-10 .col-md-2 .merge-request-angle @@ -25,7 +25,7 @@ = f.select(:target_project_id, options_from_collection_for_select(projects, 'id', 'path_with_namespace'), {}, { class: 'target_project select2 span3', disabled: @merge_request.persisted? }) .pull-left - = f.select(:target_branch, @target_branches, { include_blank: "Select branch" }, {class: 'target_branch select2 span2'}) + = f.select(:target_branch, @merge_request.target_branches, { include_blank: "Select branch" }, {class: 'target_branch select2 span2'}) .mr_target_commit.prepend-top-10 %hr |