diff options
author | Sean Packham <sean@seanpackham.com> | 2017-06-06 11:04:10 +0000 |
---|---|---|
committer | Sean Packham <sean@seanpackham.com> | 2017-06-06 11:04:10 +0000 |
commit | beceb2334db08bca25147b074d9cb218e37f0334 (patch) | |
tree | e986005e0a40f0b76d354aeb1473cf6b99093671 | |
parent | 5f77689e7837cccb0fd28748942f787aef1c3964 (diff) | |
parent | 39710abc621c54b821d6b969b512034dc487d5c5 (diff) | |
download | gitlab-ce-beceb2334db08bca25147b074d9cb218e37f0334.tar.gz |
Merge branch 'docs/remove-ref-to-wheel-settings' into 'master'
Remove references to old settings location
Closes #33041
See merge request !11932
-rw-r--r-- | doc/user/project/img/project_settings_list.png | bin | 5919 -> 0 bytes | |||
-rw-r--r-- | doc/user/project/integrations/img/accessing_integrations.png | bin | 8941 -> 0 bytes | |||
-rw-r--r-- | doc/user/project/integrations/index.md | 8 | ||||
-rw-r--r-- | doc/user/project/integrations/project_services.md | 15 | ||||
-rw-r--r-- | doc/user/project/integrations/webhooks.md | 7 | ||||
-rw-r--r-- | doc/user/project/pipelines/settings.md | 9 | ||||
-rw-r--r-- | doc/user/project/protected_branches.md | 7 |
7 files changed, 14 insertions, 32 deletions
diff --git a/doc/user/project/img/project_settings_list.png b/doc/user/project/img/project_settings_list.png Binary files differdeleted file mode 100644 index 0bb761b45c9..00000000000 --- a/doc/user/project/img/project_settings_list.png +++ /dev/null diff --git a/doc/user/project/integrations/img/accessing_integrations.png b/doc/user/project/integrations/img/accessing_integrations.png Binary files differdeleted file mode 100644 index 3b941f64998..00000000000 --- a/doc/user/project/integrations/img/accessing_integrations.png +++ /dev/null diff --git a/doc/user/project/integrations/index.md b/doc/user/project/integrations/index.md index 99093ebaed5..e384ed57de9 100644 --- a/doc/user/project/integrations/index.md +++ b/doc/user/project/integrations/index.md @@ -1,10 +1,8 @@ # Project integrations -You can find the available integrations under the **Integrations** page by -navigating to the cog icon in the upper right corner of your project. You need -to have at least [master permission][permissions] on the project. - -![Accessing the integrations](img/accessing_integrations.png) +You can find the available integrations under your project's +**Settings ➔ Integrations** page. You need to have at least +[master permission][permissions] on the project. ## Project services diff --git a/doc/user/project/integrations/project_services.md b/doc/user/project/integrations/project_services.md index 31baea507d7..51989ccaaea 100644 --- a/doc/user/project/integrations/project_services.md +++ b/doc/user/project/integrations/project_services.md @@ -6,18 +6,13 @@ functionality to GitLab. ## Accessing the project services -You can find the available services under the **Integrations** page in your -project's settings. +You can find the available services under your project's +**Settings ➔ Integrations** page. -1. Navigate to the cog icon in the upper right corner of your project. You need - to have at least [master permission][permissions] on the project. +There are more than 20 services to integrate with. Click on the one that you +want to configure. - ![Accessing the services](img/accessing_integrations.png) - -1. There are more than 20 services to integrate with. Click on the one that you - want to configure. - - ![Project services list](img/project_services.png) + ![Project services list](img/project_services.png) Below, you will find a list of the currently supported ones accompanied with comprehensive documentation. diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md index d0bb1cd11a8..0517ed3ec18 100644 --- a/doc/user/project/integrations/webhooks.md +++ b/doc/user/project/integrations/webhooks.md @@ -14,11 +14,8 @@ to the webhook URL. Webhooks can be used to update an external issue tracker, trigger CI jobs, update a backup mirror, or even deploy to your production server. -Navigate to the webhooks page by going to the **Integrations** page from your -project's settings which can be found under the wheel icon in the upper right -corner. - -![Accessing the integrations](img/accessing_integrations.png) +Navigate to the webhooks page by going to your project's +**Settings ➔ Integrations**. ## Webhook endpoint tips diff --git a/doc/user/project/pipelines/settings.md b/doc/user/project/pipelines/settings.md index 1b42c43cf8f..1d2eba4f74b 100644 --- a/doc/user/project/pipelines/settings.md +++ b/doc/user/project/pipelines/settings.md @@ -1,12 +1,7 @@ # Pipelines settings -To reach the pipelines settings: - -1. Navigate to your project and click the cog icon in the upper right corner. - - ![Project settings menu](../img/project_settings_list.png) - -1. Select **Pipelines** from the menu. +To reach the pipelines settings navigate to your project's +**Settings ➔ CI/CD Pipelines**. The following settings can be configured per project. diff --git a/doc/user/project/protected_branches.md b/doc/user/project/protected_branches.md index f7a686d2ccf..7650020b37e 100644 --- a/doc/user/project/protected_branches.md +++ b/doc/user/project/protected_branches.md @@ -27,11 +27,8 @@ See the [Changelog](#changelog) section for changes over time. To protect a branch, you need to have at least Master permission level. Note that the `master` branch is protected by default. -1. Navigate to the main page of the project. -1. In the upper right corner, click the settings wheel and select **Protected branches**. - - ![Project settings list](img/project_settings_list.png) - +1. Navigate to your project's **Settings ➔ Repository** +1. Scroll to find the **Protected branches** section. 1. From the **Branch** dropdown menu, select the branch you want to protect and click **Protect**. In the screenshot below, we chose the `develop` branch. |