diff options
Diffstat (limited to 'doc/user/project')
| -rw-r--r-- | doc/user/project/clusters/index.md | 2 | ||||
| -rw-r--r-- | doc/user/project/integrations/bamboo.md | 7 | ||||
| -rw-r--r-- | doc/user/project/integrations/webhooks.md | 16 | ||||
| -rw-r--r-- | doc/user/project/issue_board.md | 2 | ||||
| -rw-r--r-- | doc/user/project/issues/index.md | 6 | ||||
| -rw-r--r-- | doc/user/project/issues/issues_functionalities.md | 2 | ||||
| -rw-r--r-- | doc/user/project/merge_requests/index.md | 2 | ||||
| -rw-r--r-- | doc/user/project/repository/index.md | 6 | ||||
| -rw-r--r-- | doc/user/project/settings/index.md | 2 |
9 files changed, 26 insertions, 19 deletions
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index 20c46cafbe5..b25b09f7b1f 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -406,5 +406,5 @@ the deployment variables above, ensuring any pods you create are labelled with - [Connecting and deploying to an Amazon EKS cluster](eks_and_gitlab/index.md) [permissions]: ../../permissions.md -[ee]: https://about.gitlab.com/products/ +[ee]: https://about.gitlab.com/pricing/ [Auto DevOps]: ../../../topics/autodevops/index.md diff --git a/doc/user/project/integrations/bamboo.md b/doc/user/project/integrations/bamboo.md index 1e28646bc97..9b18eb15599 100644 --- a/doc/user/project/integrations/bamboo.md +++ b/doc/user/project/integrations/bamboo.md @@ -41,8 +41,11 @@ service in GitLab. 1. Click 'Atlassian Bamboo CI' 1. Select the 'Active' checkbox. 1. Enter the base URL of your Bamboo server. 'https://bamboo.example.com' -1. Enter the build key from your Bamboo build plan. Build keys are a short, - all capital letter, identifier that is unique. It will be something like PR-BLD +1. Enter the build key from your Bamboo build plan. Build keys are typically made + up from the Project Key and Plan Key that are set on project/plan creation and + separated with a dash (`-`), for example **PROJ-PLAN**. This is a short, all + uppercase identifier that is unique. When viewing a plan within Bamboo, the + build key is also shown in the browser URL, for example `https://bamboo.example.com/browse/PROJ-PLAN`. 1. If necessary, enter username and password for a Bamboo user that has access to trigger the build plan. Leave these fields blank if you do not require authentication. diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md index 19df78f4140..8c09927e2df 100644 --- a/doc/user/project/integrations/webhooks.md +++ b/doc/user/project/integrations/webhooks.md @@ -6,6 +6,10 @@ Starting from GitLab 8.5: - the `project.ssh_url` key is deprecated in favor of the `project.git_ssh_url` key - the `project.http_url` key is deprecated in favor of the `project.git_http_url` key +>**Note:** +Starting from GitLab 11.1, the logs of web hooks are automatically removed after +one month. + Project webhooks allow you to trigger a URL if for example new code is pushed or 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 @@ -54,11 +58,11 @@ Below are described the supported events. Triggered when you push to the repository except when pushing tags. -> **Note:** When more than 20 commits are pushed at once, the `commits` web hook - attribute will only contain the first 20 for performance reasons. Loading - detailed commit data is expensive. Note that despite only 20 commits being +> **Note:** When more than 20 commits are pushed at once, the `commits` web hook + attribute will only contain the first 20 for performance reasons. Loading + detailed commit data is expensive. Note that despite only 20 commits being present in the `commits` attribute, the `total_commits_count` attribute will - contain the actual total. + contain the actual total. **Request header**: @@ -1149,11 +1153,11 @@ From this page, you can repeat delivery with the same data by clicking `Resend R When GitLab sends a webhook it expects a response in 10 seconds (set default value). If it does not receive one, it'll retry the webhook. If the endpoint doesn't send its HTTP response within those 10 seconds, GitLab may decide the hook failed and retry it. -If you are receiving multiple requests, you can try increasing the default value to wait for the HTTP response after sending the webhook +If you are receiving multiple requests, you can try increasing the default value to wait for the HTTP response after sending the webhook by uncommenting or adding the following setting to your `/etc/gitlab/gitlab.rb`: ``` -gitlab_rails['webhook_timeout'] = 10 +gitlab_rails['webhook_timeout'] = 10 ``` ## Example webhook receiver diff --git a/doc/user/project/issue_board.md b/doc/user/project/issue_board.md index 10647e33f4c..e97b5d05529 100644 --- a/doc/user/project/issue_board.md +++ b/doc/user/project/issue_board.md @@ -70,7 +70,7 @@ beginning of the development lifecycle until deployed to production ### Use cases for Multiple Issue Boards With [Multiple Issue Boards](#multiple-issue-boards), available only in -[GitLab Enterprise Edition](https://about.gitlab.com/products/), +[GitLab Enterprise Edition](https://about.gitlab.com/pricing/), each team can have their own board to organize their workflow individually. #### Scrum team diff --git a/doc/user/project/issues/index.md b/doc/user/project/issues/index.md index bf17731c523..d71273ba970 100644 --- a/doc/user/project/issues/index.md +++ b/doc/user/project/issues/index.md @@ -8,7 +8,7 @@ It allows you, your team, and your collaborators to share and discuss proposals before and while implementing them. GitLab Issues and the GitLab Issue Tracker are available in all -[GitLab Products](https://about.gitlab.com/products/) as +[GitLab Products](https://about.gitlab.com/pricing/) as part of the [GitLab Workflow](https://about.gitlab.com/2016/10/25/gitlab-workflow-an-overview/). ## Use cases @@ -35,7 +35,7 @@ your project public, open to collaboration. ### Streamline collaboration With [Multiple Assignees for Issues](https://docs.gitlab.com/ee/user/project/issues/multiple_assignees_for_issues.html), -available in [GitLab Starter](https://about.gitlab.com/products/) +available in [GitLab Starter](https://about.gitlab.com/pricing/) you can streamline collaboration and allow shared responsibilities to be clearly displayed. All assignees are shown across your workflows and receive notifications (as they would as single assignees), simplifying communication and ownership. @@ -139,7 +139,7 @@ Find GitLab Issue Boards by navigating to your **Project's Dashboard** > **Issue Read through the documentation for [Issue Boards](../issue_board.md) to find out more about this feature. -With [GitLab Starter](https://about.gitlab.com/products/), you can also +With [GitLab Starter](https://about.gitlab.com/pricing/), you can also create various boards per project with [Multiple Issue Boards](https://docs.gitlab.com/ee/user/project/issue_board.html#multiple-issue-boards). ### External Issue Tracker diff --git a/doc/user/project/issues/issues_functionalities.md b/doc/user/project/issues/issues_functionalities.md index e9903b01c82..46f25417fde 100644 --- a/doc/user/project/issues/issues_functionalities.md +++ b/doc/user/project/issues/issues_functionalities.md @@ -47,7 +47,7 @@ Often multiple people likely work on the same issue together, which can especially be difficult to track in large teams where there is shared ownership of an issue. -In [GitLab Starter](https://about.gitlab.com/products/), you can also +In [GitLab Starter](https://about.gitlab.com/pricing/), you can also select multiple assignees to an issue. Learn more on the [Multiple Assignees documentation](https://docs.gitlab.com/ee/user/project/issues/multiple_assignees_for_issues.html). diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index 5e2e0c3d171..483a54051d7 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -325,4 +325,4 @@ git checkout origin/merge-requests/1 ``` [protected branches]: ../protected_branches.md -[ee]: https://about.gitlab.com/products/ "GitLab Enterprise Edition" +[ee]: https://about.gitlab.com/pricing/ "GitLab Enterprise Edition" diff --git a/doc/user/project/repository/index.md b/doc/user/project/repository/index.md index bda293bd00e..704c1777e62 100644 --- a/doc/user/project/repository/index.md +++ b/doc/user/project/repository/index.md @@ -82,7 +82,7 @@ your implementation with your team. You can live preview changes submitted to a new branch with [Review Apps](../../../ci/review_apps/index.md). -With [GitLab Starter](https://about.gitlab.com/products/), you can also request +With [GitLab Starter](https://about.gitlab.com/pricing/), you can also request [approval](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html) from your managers. To create, delete, and [branches](branches/index.md) via GitLab's UI: @@ -165,12 +165,12 @@ Find it under your project's **Repository > Compare**. ## Locked files -> Available in [GitLab Premium](https://about.gitlab.com/products/). +> Available in [GitLab Premium](https://about.gitlab.com/pricing/). Lock your files to prevent any conflicting changes. [File Locking](https://docs.gitlab.com/ee/user/project/file_lock.html) is available only in -[GitLab Premium](https://about.gitlab.com/products/). +[GitLab Premium](https://about.gitlab.com/pricing/). ## Repository's API diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md index 212e271ce6f..084d1161633 100644 --- a/doc/user/project/settings/index.md +++ b/doc/user/project/settings/index.md @@ -42,7 +42,7 @@ Set up your project's merge request settings: ### Service Desk -Enable [Service Desk](https://docs.gitlab.com/ee/user/project/service_desk.html) for your project to offer customer support. Service Desk is available in [GitLab Premium](https://about.gitlab.com/products/). +Enable [Service Desk](https://docs.gitlab.com/ee/user/project/service_desk.html) for your project to offer customer support. Service Desk is available in [GitLab Premium](https://about.gitlab.com/pricing/). ### Export project |