diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-15 10:12:40 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-15 10:12:40 +0000 |
| commit | ee54806ba37ecfba1a7086b72cc58ad48bb8f340 (patch) | |
| tree | 8041cb402911d753d7427baebac0b123bb37bac7 | |
| parent | 6038355f9e802f5078e19d31166e2c05b7b21af1 (diff) | |
| parent | 6b64a2ca3d1cad7e2cffde4ab24970c709f6da3a (diff) | |
| download | gitlab-ce-ee54806ba37ecfba1a7086b72cc58ad48bb8f340.tar.gz | |
Merge branch 'not_ignore_parameter_of_mr_change_branches_path' into 'master'
Don't ignore the parameter of MergeRequestsHelper#mr_change_branches_path
See merge request !9223
| -rw-r--r-- | app/helpers/merge_requests_helper.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index b5f8c23a667..7d8505d704e 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -75,10 +75,10 @@ module MergeRequestsHelper new_namespace_project_merge_request_path( @project.namespace, @project, merge_request: { - source_project_id: @merge_request.source_project_id, - target_project_id: @merge_request.target_project_id, - source_branch: @merge_request.source_branch, - target_branch: @merge_request.target_branch, + source_project_id: merge_request.source_project_id, + target_project_id: merge_request.target_project_id, + source_branch: merge_request.source_branch, + target_branch: merge_request.target_branch, }, change_branches: true ) |