summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-06-23 16:01:26 +0000
committerRémy Coutable <remy@rymai.me>2016-06-23 16:01:26 +0000
commit8ef649588b396059bccf17e6dab6dec3866b2479 (patch)
tree71a09ecbf39c5e20569653f4761ddb236493c1ff /app
parent26b957771974aee4457af5edf389509eb1ac80e7 (diff)
parent3aaf04ce72bdaff714bf97d0a68ceb408c5122ce (diff)
downloadgitlab-ce-8ef649588b396059bccf17e6dab6dec3866b2479.tar.gz
Merge branch 'fix-404-for-pipelines' into 'master'
Fix 404 for pipelines ## What does this MR do? Allow to access pipelines of public project by logged guest. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17885 ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4881
Diffstat (limited to 'app')
-rw-r--r--app/models/ability.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 9c58b956007..f5950879ccb 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -196,7 +196,8 @@ class Ability
@public_project_rules ||= project_guest_rules + [
:download_code,
:fork_project,
- :read_commit_status
+ :read_commit_status,
+ :read_pipeline
]
end