summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-09-05 19:08:59 +0200
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-09-05 19:08:59 +0200
commit131b51a5a2c21fec5fe79d730079a47c8dd88c27 (patch)
tree2473e35334c845edb0eedd686e218d6d80239b38
parent181b787b7940e841702799836cdb186895fa1421 (diff)
downloadgitlab-ce-improve-pipeline-visibility-desc.tar.gz
Clarify what access to job details meansimprove-pipeline-visibility-desc
-rw-r--r--app/views/projects/pipelines_settings/_show.html.haml8
-rw-r--r--doc/user/project/pipelines/settings.md16
2 files changed, 14 insertions, 10 deletions
diff --git a/app/views/projects/pipelines_settings/_show.html.haml b/app/views/projects/pipelines_settings/_show.html.haml
index efcb47d9c19..d407e187df0 100644
--- a/app/views/projects/pipelines_settings/_show.html.haml
+++ b/app/views/projects/pipelines_settings/_show.html.haml
@@ -60,17 +60,17 @@
= f.check_box :public_builds
%strong Public pipelines
.help-block
- Allow public access to pipelines and job details, including output of logs and artifacts
+ Allow public access to pipelines and job details, including output logs and artifacts
= link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'visibility-of-pipelines'), target: '_blank'
.bs-callout.bs-callout-info
%p If enabled:
%ul
%li
- For public projects, anyone can view pipelines and read output logs
+ For public projects, anyone can view pipelines and access job details (output logs and artifacts)
%li
- For internal projects, any logged in user can view pipelines and read output logs
+ For internal projects, any logged in user can view pipelines and access job details (output logs and artifacts)
%li
- For private projects, any member (guest or higher) can view pipelines and read output logs
+ For private projects, any member (guest or higher) can view pipelines and access job details (output logs and artifacts)
%p
If disabled, the access level will depend on the user's
permissions in the project.
diff --git a/doc/user/project/pipelines/settings.md b/doc/user/project/pipelines/settings.md
index 5c8e647223e..dbc1305101f 100644
--- a/doc/user/project/pipelines/settings.md
+++ b/doc/user/project/pipelines/settings.md
@@ -72,20 +72,24 @@ project setting.
If **Public pipelines** is enabled (default):
-- for **public** projects, anyone can view the pipelines and read the job details
+- for **public** projects, anyone can view the pipelines and access the job details
+ (output logs and artifacts)
- for **internal** projects, any logged in user can view the pipelines
- and read the job details
+ and access the job details
+ (output logs and artifacts)
- for **private** projects, any member (guest or higher) can view the pipelines
- and read the job details
+ and access the job details
+ (output logs and artifacts)
If **Public pipelines** is disabled:
- for **public** projects, anyone can view the pipelines, but only members
- (reporter or higher) can read the job details
+ (reporter or higher) can access the job details (output logs and artifacts)
- for **internal** projects, any logged in user can view the pipelines,
- but only members (reporter or higher) can read the job details
+ but only members (reporter or higher) can access the job details (output logs
+ and artifacts)
- for **private** projects, only members (reporter or higher)
- can view the pipelines and read the job details
+ can view the pipelines and access the job details (output logs and artifacts)
## Auto-cancel pending pipelines