From d8a3f33995ea87e59dcd783a3173c000ce46bbd8 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axil@gitlab.com>
Date: Fri, 16 Nov 2018 15:14:38 +0100
Subject: [PATCH] Make the Pages permission setting more clear

---
 .../shared/permissions/components/settings_panel.vue         | 4 ++--
 app/helpers/projects_helper.rb                               | 2 +-
 ...ect-s-permission-should-be-named-pages-access-control.yml | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/unreleased/54142-pages-in-project-s-permission-should-be-named-pages-access-control.yml

diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
index 08c7719dcf2..19d9903c988 100644
--- a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
+++ b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
@@ -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"
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 0cfc2db3285..e6484f20764 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -485,7 +485,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
 
diff --git a/changelogs/unreleased/54142-pages-in-project-s-permission-should-be-named-pages-access-control.yml b/changelogs/unreleased/54142-pages-in-project-s-permission-should-be-named-pages-access-control.yml
new file mode 100644
index 00000000000..b45ebaa1a02
--- /dev/null
+++ b/changelogs/unreleased/54142-pages-in-project-s-permission-should-be-named-pages-access-control.yml
@@ -0,0 +1,5 @@
+---
+title: Make the Pages permission setting more clear
+merge_request: 23146
+author:
+type: changed