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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
a403cea8
Commit
a403cea8
authored
Oct 07, 2019
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'docs-pages-badge' into 'master'
Fix access control badging See merge request gitlab-org/gitlab!17963
parents
17beb69e
ef8b50e0
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
5 deletions
+5
-5
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+1
-1
doc/administration/pages/index.md
doc/administration/pages/index.md
+1
-1
doc/administration/pages/source.md
doc/administration/pages/source.md
+1
-1
doc/user/permissions.md
doc/user/permissions.md
+1
-1
doc/user/project/pages/introduction.md
doc/user/project/pages/introduction.md
+1
-1
No files found.
app/helpers/projects_helper.rb
View file @
a403cea8
...
@@ -573,7 +573,7 @@ module ProjectsHelper
...
@@ -573,7 +573,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/introduction'
,
anchor:
'gitlab-pages-access-control-core
-only
'
)
pagesHelpPath:
help_page_path
(
'user/project/pages/introduction'
,
anchor:
'gitlab-pages-access-control-core'
)
}
}
end
end
...
...
doc/administration/pages/index.md
View file @
a403cea8
...
@@ -305,7 +305,7 @@ Pages access control is disabled by default. To enable it:
...
@@ -305,7 +305,7 @@ Pages access control is disabled by default. To enable it:
```
```
1.
[
Reconfigure GitLab
][
reconfigure
]
.
1.
[
Reconfigure GitLab
][
reconfigure
]
.
1.
Users can now configure it in their
[
projects' settings
](
../../user/project/pages/introduction.md#gitlab-pages-access-control-core
-only
)
.
1.
Users can now configure it in their
[
projects' settings
](
../../user/project/pages/introduction.md#gitlab-pages-access-control-core
)
.
### Running behind a proxy
### Running behind a proxy
...
...
doc/administration/pages/source.md
View file @
a403cea8
...
@@ -411,7 +411,7 @@ Pages access control is disabled by default. To enable it:
...
@@ -411,7 +411,7 @@ Pages access control is disabled by default. To enable it:
-auth-server
<URL of the GitLab instance>
-auth-server
<URL of the GitLab instance>
```
```
1.
Users can now configure it in their
[
projects' settings
](
../../user/project/pages/introduction.md#gitlab-pages-access-control-core
-only
)
.
1.
Users can now configure it in their
[
projects' settings
](
../../user/project/pages/introduction.md#gitlab-pages-access-control-core
)
.
## Change storage path
## Change storage path
...
...
doc/user/permissions.md
View file @
a403cea8
...
@@ -54,7 +54,7 @@ The following table depicts the various user permission levels in a project.
...
@@ -54,7 +54,7 @@ The following table depicts the various user permission levels in a project.
| View
[
Design Management
](
project/issues/design_management.md
)
pages
**(PREMIUM)**
| ✓ (
*1*
) | ✓ | ✓ | ✓ | ✓ |
| View
[
Design Management
](
project/issues/design_management.md
)
pages
**(PREMIUM)**
| ✓ (
*1*
) | ✓ | ✓ | ✓ | ✓ |
| View project code | ✓ (
*1*
) | ✓ | ✓ | ✓ | ✓ |
| View project code | ✓ (
*1*
) | ✓ | ✓ | ✓ | ✓ |
| Pull project code | ✓ (
*1*
) | ✓ | ✓ | ✓ | ✓ |
| Pull project code | ✓ (
*1*
) | ✓ | ✓ | ✓ | ✓ |
| View GitLab Pages protected by
[
access control
](
project/pages/introduction.md#gitlab-pages-access-control-core
-only
)
| ✓ | ✓ | ✓ | ✓ | ✓ |
| View GitLab Pages protected by
[
access control
](
project/pages/introduction.md#gitlab-pages-access-control-core
)
| ✓ | ✓ | ✓ | ✓ | ✓ |
| View wiki pages | ✓ (
*1*
) | ✓ | ✓ | ✓ | ✓ |
| View wiki pages | ✓ (
*1*
) | ✓ | ✓ | ✓ | ✓ |
| See a list of jobs | ✓ (
*3*
) | ✓ | ✓ | ✓ | ✓ |
| See a list of jobs | ✓ (
*3*
) | ✓ | ✓ | ✓ | ✓ |
| See a job log | ✓ (
*3*
) | ✓ | ✓ | ✓ | ✓ |
| See a job log | ✓ (
*3*
) | ✓ | ✓ | ✓ | ✓ |
...
...
doc/user/project/pages/introduction.md
View file @
a403cea8
...
@@ -67,7 +67,7 @@ Some static site generators provide plugins for that functionality so that you
...
@@ -67,7 +67,7 @@ Some static site generators provide plugins for that functionality so that you
don't have to create and edit HTML files manually. For example, Jekyll has the
don't have to create and edit HTML files manually. For example, Jekyll has the
[
redirect-from plugin
](
https://github.com/jekyll/jekyll-redirect-from
)
.
[
redirect-from plugin
](
https://github.com/jekyll/jekyll-redirect-from
)
.
## GitLab Pages Access Control **(CORE
ONLY
)**
## GitLab Pages Access Control **(CORE)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/33422) in GitLab 11.5.
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/33422) in GitLab 11.5.
...
...
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