diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 21:08:01 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 21:08:01 +0000 |
commit | 95ad46159e4cd93f2b31838199180d824e041994 (patch) | |
tree | d41880d3b6a0093463694978590e590efb08caef /doc/integration | |
parent | 2c72daf2f1744f2b8c8c6674c266907e9ef55558 (diff) | |
download | gitlab-ce-95ad46159e4cd93f2b31838199180d824e041994.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration')
-rw-r--r-- | doc/integration/README.md | 4 | ||||
-rw-r--r-- | doc/integration/external-issue-tracker.md | 6 | ||||
-rw-r--r-- | doc/integration/jenkins.md | 6 | ||||
-rw-r--r-- | doc/integration/slash_commands.md | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/doc/integration/README.md b/doc/integration/README.md index 5cda537ac39..bba38922b9d 100644 --- a/doc/integration/README.md +++ b/doc/integration/README.md @@ -57,9 +57,9 @@ GitLab can be integrated with the following enhancements: - Attach merge requests to [Trello](trello_power_up.md) cards. - Enable integrated code intelligence powered by [Sourcegraph](sourcegraph.md). -## Project services +## Integrations -Integration with services such as Campfire, Flowdock, HipChat, Pivotal Tracker, and Slack are available as [Project Services](../user/project/integrations/project_services.md). +Integration with services such as Campfire, Flowdock, HipChat, Pivotal Tracker, and Slack are available as [Integrations](../user/project/integrations/overview.md). ## Troubleshooting diff --git a/doc/integration/external-issue-tracker.md b/doc/integration/external-issue-tracker.md index c3328e01081..8b4ebc337de 100644 --- a/doc/integration/external-issue-tracker.md +++ b/doc/integration/external-issue-tracker.md @@ -15,11 +15,11 @@ GitLab menu always opens the internal issue tracker. When disabled, the link is ## Configuration -The configuration is done via a project's **Services**. +The configuration is done via a project's **Integrations**. -### Project Service +### Integration -To enable an external issue tracker you must configure the appropriate **Service**. +To enable an external issue tracker you must configure the appropriate **Integration**. Visit the links below for details: - [Redmine](../user/project/integrations/redmine.md) diff --git a/doc/integration/jenkins.md b/doc/integration/jenkins.md index fee30578be4..5514b756c00 100644 --- a/doc/integration/jenkins.md +++ b/doc/integration/jenkins.md @@ -6,8 +6,8 @@ In GitLab 8.3, Jenkins integration using the was deprecated in favor of the [GitLab Plugin](https://wiki.jenkins.io/display/JENKINS/GitLab+Plugin). The deprecated integration has been renamed to [Jenkins CI (Deprecated)](jenkins_deprecated.md) in the -project service settings. We may remove this in a future release and recommend -using the new 'Jenkins CI' project service instead which is described in this +integration settings. We may remove this in a future release and recommend +using the new 'Jenkins CI' integration instead which is described in this document. ## Overview @@ -138,7 +138,7 @@ configured or there was an error reporting the status via the API. ### Merge Request event does not trigger a Jenkins Pipeline -Check [service hook logs](../user/project/integrations/project_services.md#troubleshooting-project-services) for request failures or check the `/var/log/gitlab/gitlab-rails/production.log` file for messages like: +Check [service hook logs](../user/project/integrations/overview.md#troubleshooting-integrations) for request failures or check the `/var/log/gitlab/gitlab-rails/production.log` file for messages like: ```plaintext WebHook Error => Net::ReadTimeout diff --git a/doc/integration/slash_commands.md b/doc/integration/slash_commands.md index f74a4f1a77f..11abf3ca203 100644 --- a/doc/integration/slash_commands.md +++ b/doc/integration/slash_commands.md @@ -2,7 +2,7 @@ > The `run` command was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/4466) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.6. [Moved](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/24780) to [GitLab Core](https://about.gitlab.com/pricing/) in 11.9. -Slash commands in Mattermost and Slack allow you to control GitLab and view GitLab content right inside your chat client, without having to leave it. For Slack, this requires a [project service configuration](../user/project/integrations/slack_slash_commands.md). Simply type the command as a message in your chat client to activate it. +Slash commands in Mattermost and Slack allow you to control GitLab and view GitLab content right inside your chat client, without having to leave it. For Slack, this requires an [integration configuration](../user/project/integrations/slack_slash_commands.md). Simply type the command as a message in your chat client to activate it. Commands are scoped to a project, with a trigger term that is specified during configuration. |