diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-02-06 12:08:05 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-02-06 12:08:05 +0100 |
| commit | 50aec8dd0df863c6f129edb505218e744c479a4b (patch) | |
| tree | 144f6d95364e9441e71a9fafe028fa5621a61cc4 /doc/api/services.md | |
| parent | 16a72896a21ef065a0b259d32a43dd6554cee1d2 (diff) | |
| parent | 572fb0be9b1d45437b7c0ed1000399657f471ec7 (diff) | |
| download | gitlab-ce-50aec8dd0df863c6f129edb505218e744c479a4b.tar.gz | |
Merge branch 'master' into feature/gb/paginated-environments-api
* master: (295 commits)
Add index to labels for `type` and project_id`
fix rack-proxy dependency in production
Fixed typo
fix failing test
fix Vue warnings for missing element
UX Guide: Button placement in groups
Change window size before visiting page, to get correct scroll position
Fix slash commands spec error
Move project services to new location under Integrations
Move webhooks to new a location under Integrations
Fixed eslint test failure
Fixed adding to list bug
Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index
Fixed modal lists dropdown not updating when list is deleted
Fixed remove btn error after creating new issue in list
Removed duplicated test
Removed Masonry, instead uses groups of data
Uses mixins for repeated functions
Fixed up specs
Props use objects with required & type values
...
Diffstat (limited to 'doc/api/services.md')
| -rw-r--r-- | doc/api/services.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/api/services.md b/doc/api/services.md index 1466b8189b0..fba5da6587d 100644 --- a/doc/api/services.md +++ b/doc/api/services.md @@ -808,5 +808,5 @@ Get JetBrains TeamCity CI service settings for a project. GET /projects/:id/services/teamcity ``` -[jira-doc]: ../project_services/jira.md +[jira-doc]: ../user/project/integrations/jira.md [old-jira-api]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-13-stable/doc/api/services.md#jira |