diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 18:07:39 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 18:07:39 +0300 |
commit | 862d225ca0d8eb452e56b8fe5a0109aac796e872 (patch) | |
tree | ebf0a5d43bd271fadd9004245fb7c7cf0543dcc1 /doc | |
parent | d10a462fedbd7794a83abdba9b4526600f71de5b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/administration/pages/index.md | 3 | ||||
-rw-r--r-- | doc/ci/examples/test-and-deploy-python-application-to-heroku.md | 2 | ||||
-rw-r--r-- | doc/development/changelog.md | 7 | ||||
-rw-r--r-- | doc/user/project/pages/pages_access_control.md | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md index eb3fc07d7c9..d1b58f2ee18 100644 --- a/doc/administration/pages/index.md +++ b/doc/administration/pages/index.md @@ -305,7 +305,7 @@ Pages access control is disabled by default. To enable it: ``` 1. [Reconfigure GitLab][reconfigure]. -1. Users can now configure it in their [projects' settings](../../user/project/pages/introduction.md#gitlab-pages-access-control-core). +1. Users can now configure it in their [projects' settings](../../user/project/pages/pages_access_control.md). ### Running behind a proxy @@ -500,6 +500,7 @@ then you must use the following procedure to configure [access control](#access- ```ruby gitlab_pages['gitlab_server'] = "https://<your-gitlab-server-URL>" + gitlab_pages['access_control'] = true ``` 1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect. diff --git a/doc/ci/examples/test-and-deploy-python-application-to-heroku.md b/doc/ci/examples/test-and-deploy-python-application-to-heroku.md index 34d53f67adc..03381dc16ff 100644 --- a/doc/ci/examples/test-and-deploy-python-application-to-heroku.md +++ b/doc/ci/examples/test-and-deploy-python-application-to-heroku.md @@ -83,7 +83,7 @@ gitlab-runner register \ --description "python-3.5" \ --executor "docker" \ --docker-image python:3.5 \ - --docker-postgres latest + --docker-services postgres:latest ``` With the command above, you create a runner that uses the [`python:3.5`](https://hub.docker.com/_/python) image and uses a [PostgreSQL](https://hub.docker.com/_/postgres) database. diff --git a/doc/development/changelog.md b/doc/development/changelog.md index af2c540cca5..f693267b554 100644 --- a/doc/development/changelog.md +++ b/doc/development/changelog.md @@ -33,7 +33,8 @@ the `author` field. GitLab team members **should not**. ## What warrants a changelog entry? -- Any change that introduces a database migration **must** have a changelog entry. +- Any change that introduces a database migration, whether it's regular, post, + or data migration, **must** have a changelog entry. - Any user-facing change **should** have a changelog entry. Example: "GitLab now uses system fonts for all text." - Performance improvements **should** have a changelog entry. @@ -43,8 +44,8 @@ the `author` field. GitLab team members **should not**. - Any docs-only changes **should not** have a changelog entry. - Any change behind a feature flag **should not** have a changelog entry. The entry should be added [in the merge request removing the feature flags](feature_flags/development.md). - If the change includes a database migration, there should be a changelog entry - for the migration change. + If the change includes a database migration (regular, post, or data migration), + there should be a changelog entry for the migration change. - A fix for a regression introduced and then fixed in the same release (i.e., fixing a bug introduced during a monthly release candidate) **should not** have a changelog entry. diff --git a/doc/user/project/pages/pages_access_control.md b/doc/user/project/pages/pages_access_control.md index cd715c6e3b9..1d8119cfe87 100644 --- a/doc/user/project/pages/pages_access_control.md +++ b/doc/user/project/pages/pages_access_control.md @@ -11,7 +11,7 @@ You can enable Pages access control on your project, so that only [members of your project](../../permissions.md#project-members-permissions) (at least Guest) can access your website: -1. Navigate to your project's **Settings > General > Permissions**. +1. Navigate to your project's **Settings > General** and expand **Visibility, project features, permissions**. 1. Toggle the **Pages** button to enable the access control. NOTE: **Note:** |