diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 15:09:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 15:09:00 +0300 |
| commit | ae78b85a25cb0c19c3d6a2e4e6c7ca91ed50787d (patch) | |
| tree | c53ad0fcdab26725814f1dc5267f6a04ebe4cf73 /doc | |
| parent | 38149afcf95e7669a7a99828c579d185b70c04dc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/project/integrations/gitlab_slack_application.md | 6 | ||||
| -rw-r--r-- | doc/user/project/integrations/webhooks.md | 4 | ||||
| -rw-r--r-- | doc/user/search/index.md | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/doc/user/project/integrations/gitlab_slack_application.md b/doc/user/project/integrations/gitlab_slack_application.md index c1e6f93de30..72b1318a16a 100644 --- a/doc/user/project/integrations/gitlab_slack_application.md +++ b/doc/user/project/integrations/gitlab_slack_application.md @@ -3,9 +3,9 @@ NOTE: **Note:** The GitLab Slack application is only configurable for GitLab.com. It will **not** work for on-premises installations where you can configure the -[Slack slash commands](slack_slash_commands.md) service instead. We're working -with Slack on making this configurable for all GitLab installations, but there's -no ETA. +[Slack slash commands](slack_slash_commands.md) service instead. We're planning +to make this configurable for all GitLab installations, but there's +no ETA - see [#28164](https://gitlab.com/gitlab-org/gitlab/issues/28164). It was first introduced in GitLab 9.4 and distributed to Slack App Directory in GitLab 10.2. diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md index 5c9a21e2fbb..d93c4b3cdae 100644 --- a/doc/user/project/integrations/webhooks.md +++ b/doc/user/project/integrations/webhooks.md @@ -174,7 +174,8 @@ X-Gitlab-Event: Push Hook "commits": [ { "id": "b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327", - "message": "Update Catalan translation to e38cb41.", + "message": "Update Catalan translation to e38cb41.\n\nSee https://gitlab.com/gitlab-org/gitlab for more information", + "title": "Update Catalan translation to e38cb41.", "timestamp": "2011-12-12T14:27:31+02:00", "url": "http://example.com/mike/diaspora/commit/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327", "author": { @@ -188,6 +189,7 @@ X-Gitlab-Event: Push Hook { "id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7", "message": "fixed readme", + "title": "fixed readme", "timestamp": "2012-01-03T23:36:29+02:00", "url": "http://example.com/mike/diaspora/commit/da1560886d4f094c3e6c9ef40349f7d38b5d27d7", "author": { diff --git a/doc/user/search/index.md b/doc/user/search/index.md index 4e0e0734200..46c9c974c34 100644 --- a/doc/user/search/index.md +++ b/doc/user/search/index.md @@ -41,6 +41,7 @@ groups: - [Label](../project/labels.md) - My-reaction - Confidential + - Epic ([Introduced](https://gitlab.com/gitlab-org/gitlab/issues/195704) in GitLab 12.8) - Search for this text 1. Select or type the operator to use for filtering the attribute. The following operators are available: |