diff options
author | Marcel Amirault <ravlen@gmail.com> | 2019-02-12 12:39:48 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-02-12 12:39:48 +0000 |
commit | 9d6a8003e07ad621206387c641343e020aeac188 (patch) | |
tree | 48ede72825b998a6848531c35747b9744a64932d /doc/user | |
parent | 8d7ed982ef361120fef3b431249684333a5462c3 (diff) | |
download | gitlab-ce-9d6a8003e07ad621206387c641343e020aeac188.tar.gz |
Docs: Realign more CE docs that diverged from EE unnecessarily (second MR)
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/admin_area/settings/third_party_offers.md | 5 | ||||
-rw-r--r-- | doc/user/profile/preferences.md | 5 | ||||
-rw-r--r-- | doc/user/project/integrations/webhooks.md | 25 | ||||
-rw-r--r-- | doc/user/project/repository/web_editor.md | 4 | ||||
-rw-r--r-- | doc/user/reserved_names.md | 2 |
5 files changed, 35 insertions, 6 deletions
diff --git a/doc/user/admin_area/settings/third_party_offers.md b/doc/user/admin_area/settings/third_party_offers.md index 177251b52b9..23311801790 100644 --- a/doc/user/admin_area/settings/third_party_offers.md +++ b/doc/user/admin_area/settings/third_party_offers.md @@ -3,4 +3,7 @@ > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20379) > in [GitLab Core](https://about.gitlab.com/pricing/) 11.1 -The display of third party offers can be controlled in the Admin Area -> Settings page. +Within GitLab, we inform users of available third-party offers they might find valuable in order to enhance the development of their projects. +An example is the Google Cloud Platform free credit for using [Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine/). + +The display of third-party offers can be toggled in the Admin area on the Settings page. diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md index 363d3db8db1..7387d1810ca 100644 --- a/doc/user/profile/preferences.md +++ b/doc/user/profile/preferences.md @@ -57,7 +57,10 @@ and default views of your dashboard and the projects' landing pages. ### Layout width GitLab can be set up to use different widths depending on your liking. Choose -between the fixed (max. 1200px) and the fluid (100%) application layout. +between the fixed (max. `1280px`) and the fluid (`100%`) application layout. + +NOTE: **Note:** +While `1280px` is the standard max width when using fixed layout, some pages still use 100% width, depending on the content. ### Default dashboard diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md index 4d1d95da6f0..60a4c6aaf64 100644 --- a/doc/user/project/integrations/webhooks.md +++ b/doc/user/project/integrations/webhooks.md @@ -22,12 +22,37 @@ a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. GitLab will send a POST request with data to the webhook URL. +In most cases, you'll need to set up your own [webhook receiver](#example-webhook-receiver) +to receive information from GitLab, and send it to another app, according to your needs. +We already have a [built-in receiver](http://docs.gitlab.com/ce/project_services/slack.html) +for sending [Slack](https://api.slack.com/incoming-webhooks) notifications _per project_. + +## Overview + +[Webhooks](https://en.wikipedia.org/wiki/Webhook) are "_user-defined HTTP +callbacks_". They are usually triggered by some +event, such as pushing code to a repository or a comment being posted to a blog. +When that event occurs, the source app makes an HTTP request to the URI +configured for the webhook. The action taken may be anything. +Common uses are to trigger builds with continuous integration systems or to +notify bug tracking systems. + Webhooks can be used to update an external issue tracker, trigger CI jobs, update a backup mirror, or even deploy to your production server. +They are available **per project** for GitLab Community Edition, +and **per project and per group** for **GitLab Enterprise Edition**. Navigate to the webhooks page by going to your project's **Settings ➔ Integrations**. +## Use-cases + +- You can set up a webhook in GitLab to send a notification to +[Slack](https://api.slack.com/incoming-webhooks) every time a build fails, for example +- You can [integrate with Twilio to be notified via SMS](https://www.datadoghq.com/blog/send-alerts-sms-customizable-webhooks-twilio/) +every time an issue is created for a specific project or group within GitLab +- You can use them to [automatically assign labels to merge requests](https://about.gitlab.com/2016/08/19/applying-gitlab-labels-automatically/). + ## Webhook endpoint tips If you are writing your own endpoint (web server) that will receive diff --git a/doc/user/project/repository/web_editor.md b/doc/user/project/repository/web_editor.md index 035028c9266..57e8437697b 100644 --- a/doc/user/project/repository/web_editor.md +++ b/doc/user/project/repository/web_editor.md @@ -33,13 +33,13 @@ easy for you. ![First file for your project](img/web_editor_template_dropdown_first_file.png) -When clicking on either `LICENSE` or `.gitignore`, a dropdown will be displayed +When clicking on either `LICENSE` or `.gitignore`, etc., a dropdown will be displayed to provide you with a template which might be suitable for your project. ![MIT license selected](img/web_editor_template_dropdown_mit_license.png) The license, changelog, contribution guide, or `.gitlab-ci.yml` file could also -be added through a button on the project page. In the example below the license +be added through a button on the project page. In the example below, the license has already been created, which creates a link to the license itself. ![New file button](img/web_editor_template_dropdown_buttons.png) diff --git a/doc/user/reserved_names.md b/doc/user/reserved_names.md index 45c306f5988..a14df6c8402 100644 --- a/doc/user/reserved_names.md +++ b/doc/user/reserved_names.md @@ -61,8 +61,6 @@ Currently the following names are reserved as top level groups: - favicon.ico - favicon.png - groups -- header_logo_dark.png -- header_logo_light.png - health_check - help - import |