diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-04-03 18:47:14 +0000 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-04-05 21:06:02 -0700 |
| commit | 29d8b4ee72c28ade5006f3f1343402782c38b231 (patch) | |
| tree | 04c21670190a3b210f01aaf04a4e0ab5ea542c02 /app/services/merge_requests | |
| parent | 2e8aa209f013d567bb3956a3e4201d3b2d63fe10 (diff) | |
| download | gitlab-ce-29d8b4ee72c28ade5006f3f1343402782c38b231.tar.gz | |
Merge branch '29364-private-projects-mr-fix'
Don’t show source project name when user does not have access
See merge request !2081
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/build_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb index fdce542bd9e..d45da5180e1 100644 --- a/app/services/merge_requests/build_service.rb +++ b/app/services/merge_requests/build_service.rb @@ -21,7 +21,9 @@ module MergeRequests delegate :target_branch, :source_branch, :source_project, :target_project, :compare_commits, :wip_title, :description, :errors, to: :merge_request def find_source_project - source_project || project + return source_project if source_project.present? && can?(current_user, :read_project, source_project) + + project end def find_target_project |