Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
ccae561f
Commit
ccae561f
authored
Jan 23, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix selectbox when submit MR from fork to origin
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
69ff7657
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+4
-0
app/views/projects/merge_requests/update_branches.js.haml
app/views/projects/merge_requests/update_branches.js.haml
+6
-2
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
ccae561f
...
@@ -152,6 +152,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -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
...
...
app/views/projects/merge_requests/update_branches.js.haml
View file @
ccae561f
: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");
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment