diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 00:07:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 00:07:54 +0300 |
| commit | 2fd92f2dc784ade9cb4e1c33dd60cbfad7b86818 (patch) | |
| tree | 7779f36689db97a46e0268a4aec1d49f283eb0c8 /app/presenters | |
| parent | 42ca24aa5bbab7a2d43bc866d9bee9876941cea2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/presenters')
| -rw-r--r-- | app/presenters/ci/pipeline_presenter.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/presenters/ci/pipeline_presenter.rb b/app/presenters/ci/pipeline_presenter.rb index 37abefb5664..ce9a3346b4b 100644 --- a/app/presenters/ci/pipeline_presenter.rb +++ b/app/presenters/ci/pipeline_presenter.rb @@ -134,7 +134,11 @@ module Ci def all_related_merge_requests strong_memoize(:all_related_merge_requests) do - pipeline.ref ? pipeline.all_merge_requests_by_recency.to_a : [] + if pipeline.ref && can?(current_user, :read_merge_request, pipeline.project) + pipeline.all_merge_requests_by_recency.to_a + else + [] + end end end end |