Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
d8a3f339
Commit
d8a3f339
authored
Nov 16, 2018
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make the Pages permission setting more clear
parent
bd268a1e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
...projects/shared/permissions/components/settings_panel.vue
+2
-2
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+1
-1
changelogs/unreleased/54142-pages-in-project-s-permission-should-be-named-pages-access-control.yml
...ect-s-permission-should-be-named-pages-access-control.yml
+5
-0
No files found.
app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
View file @
d8a3f339
...
@@ -325,8 +325,8 @@ export default {
...
@@ -325,8 +325,8 @@ export default {
<project-setting-row
<project-setting-row
v-if=
"pagesAvailable && pagesAccessControlEnabled"
v-if=
"pagesAvailable && pagesAccessControlEnabled"
:help-path=
"pagesHelpPath"
:help-path=
"pagesHelpPath"
label=
"Pages"
label=
"Pages
access control
"
help-text=
"
Static website for the project.
"
help-text=
"
Access control for the project's static website
"
>
>
<project-feature-setting
<project-feature-setting
v-model=
"pagesAccessLevel"
v-model=
"pagesAccessLevel"
...
...
app/helpers/projects_helper.rb
View file @
d8a3f339
...
@@ -485,7 +485,7 @@ module ProjectsHelper
...
@@ -485,7 +485,7 @@ module ProjectsHelper
lfsHelpPath:
help_page_path
(
'workflow/lfs/manage_large_binaries_with_git_lfs'
),
lfsHelpPath:
help_page_path
(
'workflow/lfs/manage_large_binaries_with_git_lfs'
),
pagesAvailable:
Gitlab
.
config
.
pages
.
enabled
,
pagesAvailable:
Gitlab
.
config
.
pages
.
enabled
,
pagesAccessControlEnabled:
Gitlab
.
config
.
pages
.
access_control
,
pagesAccessControlEnabled:
Gitlab
.
config
.
pages
.
access_control
,
pagesHelpPath:
help_page_path
(
'user/project/pages/in
dex.md
'
)
pagesHelpPath:
help_page_path
(
'user/project/pages/in
troduction'
,
anchor:
'gitlab-pages-access-control-core-only
'
)
}
}
end
end
...
...
changelogs/unreleased/54142-pages-in-project-s-permission-should-be-named-pages-access-control.yml
0 → 100644
View file @
d8a3f339
---
title
:
Make the Pages permission setting more clear
merge_request
:
23146
author
:
type
:
changed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment