Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-26 14:33:48 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-26 14:33:48 +0400
commit1ff1b6d816cd1150df436a8ff56502e8adfa1b0e (patch)
tree198b14c97b07839d9915b57e7905bf43cfe20c1f /app/helpers
parent93cdf8a312466a459b74c30236704582a9fccbed (diff)
parent9439cb55260185b4a456982613f657f3c1b11915 (diff)
Merge pull request #5719 from jacob-carlborg/mr_target
By default, target original repository if it's a fork when creating new MR.
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/merge_requests_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 62f061bb079..b8285d43302 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -1,8 +1,9 @@
module MergeRequestsHelper
def new_mr_path_from_push_event(event)
+ target_project = event.project.forked_from_project || event.project
new_project_merge_request_path(
event.project,
- new_mr_from_push_event(event, event.project)
+ new_mr_from_push_event(event, target_project)
)
end