diff options
| author | mhasbini <mohammad.hasbini@gmail.com> | 2017-04-27 01:04:07 +0300 |
|---|---|---|
| committer | mhasbini <mohammad.hasbini@gmail.com> | 2017-04-27 01:04:07 +0300 |
| commit | ccac05dd90cb5cfa9abbeb11a50f953541eb83bb (patch) | |
| tree | ff721d7fddfa595a75b3e2594ab7b5af7590d47f /app/services/merge_requests | |
| parent | 43fb9279ce39d51b1deceb5108560bf37b8d340d (diff) | |
Fix 404 when upstream has disabled merge requests
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/build_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb index d45da5180e1..bc0e7ad4e39 100644 --- a/app/services/merge_requests/build_service.rb +++ b/app/services/merge_requests/build_service.rb @@ -28,7 +28,7 @@ module MergeRequests def find_target_project return target_project if target_project.present? && can?(current_user, :read_project, target_project) - project.forked_from_project || project + project.default_merge_request_target end def find_target_branch |