diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-02 14:14:41 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-02 14:14:41 +0300 |
| commit | 3efe534255a130f41d1427efd35ea84e39a99297 (patch) | |
| tree | 0369fa3167b9c592069e8bf73505836d8e8ed6f9 /app/services | |
| parent | 59175a576723c2a105180c1e526d4bd2f597c377 (diff) | |
| parent | ccac05dd90cb5cfa9abbeb11a50f953541eb83bb (diff) | |
Merge branch '26488-target-disabled-mr' into 'master'
Fix 404 when upstream disabled merge requests
Closes #26488
See merge request !10427
Diffstat (limited to 'app/services')
| -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 |