Commit 27276c55 authored by Paco Guzman's avatar Paco Guzman
Browse files

Remove controller instance variables that are in the mergerequest

parent 023d4812
......@@ -145,14 +145,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
build_merge_request
@noteable = @merge_request
@target_branches = if @merge_request.target_project
@merge_request.target_project.repository.branch_names
else
[]
end
@target_project = merge_request.target_project
@source_project = merge_request.source_project
@commits = @merge_request.compare_commits.reverse
@commit = @merge_request.diff_head_commit
@base_commit = @merge_request.diff_base_commit
......
......@@ -82,7 +82,7 @@
:javascript
new Compare({
targetProjectUrl: "#{update_branches_namespace_project_merge_requests_path(@source_project.namespace, @source_project)}",
sourceBranchUrl: "#{branch_from_namespace_project_merge_requests_path(@source_project.namespace, @source_project)}",
targetBranchUrl: "#{branch_to_namespace_project_merge_requests_path(@source_project.namespace, @source_project)}"
targetProjectUrl: "#{update_branches_namespace_project_merge_requests_path(@merge_request.source_project.namespace, @merge_request.source_project)}",
sourceBranchUrl: "#{branch_from_namespace_project_merge_requests_path(@merge_request.source_project.namespace, @merge_request.source_project)}",
targetBranchUrl: "#{branch_to_namespace_project_merge_requests_path(@merge_request.source_project.namespace, @merge_request.source_project)}"
});
......@@ -54,7 +54,7 @@
.issuable-form-select-holder
= users_select_tag("#{issuable.class.model_name.param_key}[assignee_id]",
placeholder: 'Select assignee', class: 'custom-form-control', null_user: true,
selected: issuable.assignee_id, project: @target_project || @project,
selected: issuable.assignee_id, project: issuable.respond_to?(:target_project) && issuable.target_project || @project,
first_user: true, current_user: true, include_blank: true)
%div
= link_to 'Assign to me', '#', class: 'assign-to-me-link prepend-top-5 inline'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment