diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-01-07 10:05:41 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-01-07 10:05:41 +0000 |
| commit | 465b3041e71f2e454d9e7d6c154455f5ece14f38 (patch) | |
| tree | b05b0cb56a2009113c2a07111e1e22fce675e8ba | |
| parent | 604073ffc38f938e36f613c592c444d56c99f49c (diff) | |
| parent | d8a3f33995ea87e59dcd783a3173c000ce46bbd8 (diff) | |
| download | gitlab-ce-465b3041e71f2e454d9e7d6c154455f5ece14f38.tar.gz | |
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
3 files changed, 8 insertions, 3 deletions
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 fcab8cc3380..af7a262e32c 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -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 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 |