Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gpt
large_projects
gitlabhq1
Commits
27276c55
Commit
27276c55
authored
8 years ago
by
Paco Guzman
Browse files
Options
Download
Email Patches
Plain Diff
Remove controller instance variables that are in the mergerequest
parent
023d4812
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
12 deletions
+4
-12
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+0
-8
app/views/projects/merge_requests/_new_compare.html.haml
app/views/projects/merge_requests/_new_compare.html.haml
+3
-3
app/views/shared/issuable/_form.html.haml
app/views/shared/issuable/_form.html.haml
+1
-1
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
27276c55
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/_new_compare.html.haml
View file @
27276c55
...
...
@@ -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
)
}
"
});
This diff is collapsed.
Click to expand it.
app/views/shared/issuable/_form.html.haml
View file @
27276c55
...
...
@@ -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'
...
...
This diff is collapsed.
Click to expand it.
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