Commit 465b3041 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch...

Merge branch '54142-pages-in-project-s-permission-should-be-named-pages-access-control' into 'master'

Resolve "Pages in project's permissions settings should be named Pages access control"

Closes #54142

See merge request gitlab-org/gitlab-ce!23146
parents 604073ff d8a3f339
......@@ -325,8 +325,8 @@ export default {
<project-setting-row
v-if="pagesAvailable && pagesAccessControlEnabled"
:help-path="pagesHelpPath"
label="Pages"
help-text="Static website for the project."
label="Pages access control"
help-text="Access control for the project's static website"
>
<project-feature-setting
v-model="pagesAccessLevel"
......
......@@ -488,7 +488,7 @@ module ProjectsHelper
lfsHelpPath: help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs'),
pagesAvailable: Gitlab.config.pages.enabled,
pagesAccessControlEnabled: Gitlab.config.pages.access_control,
pagesHelpPath: help_page_path('user/project/pages/index.md')
pagesHelpPath: help_page_path('user/project/pages/introduction', anchor: 'gitlab-pages-access-control-core-only')
}
end
......
---
title: Make the Pages permission setting more clear
merge_request: 23146
author:
type: changed
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment