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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
4974f15d
Commit
4974f15d
authored
Dec 16, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Using `merge_request` in that case would break tests
This is a bad smell that we should fix
parent
7d5eb7d0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
ee/app/controllers/ee/projects/merge_requests/application_controller.rb
...lers/ee/projects/merge_requests/application_controller.rb
+2
-2
No files found.
ee/app/controllers/ee/projects/merge_requests/application_controller.rb
View file @
4974f15d
...
...
@@ -38,8 +38,8 @@ module EE
# Target the MR target project in priority, else it depends whether the project
# is forked.
target_project
=
if
merge_request
merge_request
.
target_project
target_project
=
if
@merge_request
# rubocop:disable Gitlab/ModuleWithInstanceVariables
@merge_request
.
target_project
# rubocop:disable Gitlab/ModuleWithInstanceVariables
elsif
project
.
forked?
&&
project
.
id
.
to_s
!=
mr_params
[
:target_project_id
]
project
.
forked_from_project
else
...
...
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