diff options
| author | Marin Jankovski <marin@gitlab.com> | 2015-02-04 17:11:38 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2015-02-04 17:11:38 +0000 |
| commit | d685d45222b5c5e8b790e1cfc047e8dba7a0d56a (patch) | |
| tree | c84423db14ba3c59c7599812d599ffbacc70cc37 /doc/integration/README.md | |
| parent | 56a456b43dba7d772db45e2b73aa18b5eab53d37 (diff) | |
| parent | 7aa3f6053efd9c1e2db962f7146a13bdf3d147c9 (diff) | |
| download | gitlab-ce-d685d45222b5c5e8b790e1cfc047e8dba7a0d56a.tar.gz | |
Merge branch 'consolidate_ssh_docs' into 'master'
Consolidate SSH docs
The two available SSH topics were quite short, so it made sense to combine them.
Includes fixes a few missing words, punctuation.
See merge request !328
Diffstat (limited to 'doc/integration/README.md')
| -rw-r--r-- | doc/integration/README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/integration/README.md b/doc/integration/README.md index 357ed038314..0087167bb84 100644 --- a/doc/integration/README.md +++ b/doc/integration/README.md @@ -13,7 +13,7 @@ Jenkins support is [available in GitLab EE](http://doc.gitlab.com/ee/integration ## Project services -Integration with services such as Campfire, Flowdock, Gemnasium, HipChat, PivotalTracker and Slack are available in the from of a Project Service. +Integration with services such as Campfire, Flowdock, Gemnasium, HipChat, Pivotal Tracker, and Slack are available in the form of a Project Service. You can find these within GitLab in the Services page under Project Settings if you are at least a master on the project. Project Services are a bit like plugins in that they allow a lot of freedom in adding functionality to GitLab, for example there is also a service that can send an email every time someone pushes new commits. Because GitLab is open source we can ship with the code and tests for all plugins. |