diff options
| author | Felipe Artur <fcardozo@gitlab.com> | 2018-03-06 16:28:54 +0000 |
|---|---|---|
| committer | Felipe Artur <fcardozo@gitlab.com> | 2018-03-06 16:28:54 +0000 |
| commit | e77c4e9efe0e19187929e5836cda5a3a59d0f89f (patch) | |
| tree | 91daaa89bb48457456f931c6b818f5e200390b56 /doc/api/README.md | |
| parent | 1e137c273ca6314d0ed6744910b95f179b1d538c (diff) | |
| parent | 9a8f5a2b605f85ace3c81a32cf1855f79cabde43 (diff) | |
| download | gitlab-ce-e77c4e9efe0e19187929e5836cda5a3a59d0f89f.tar.gz | |
Merge branch 'master' into 'issue_38337'
# Conflicts:
# app/models/group.rb
# db/schema.rb
Diffstat (limited to 'doc/api/README.md')
| -rw-r--r-- | doc/api/README.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/api/README.md b/doc/api/README.md index b7981156086..b67500a9b9e 100644 --- a/doc/api/README.md +++ b/doc/api/README.md @@ -24,6 +24,7 @@ following locations: - [GitLab CI Config templates](templates/gitlab_ci_ymls.md) - [Groups](groups.md) - [Group Access Requests](access_requests.md) +- [Group Badges](group_badges.md) - [Group Members](members.md) - [Issues](issues.md) - [Issue Boards](boards.md) @@ -44,6 +45,7 @@ following locations: - [Pipeline Schedules](pipeline_schedules.md) - [Projects](projects.md) including setting Webhooks - [Project Access Requests](access_requests.md) +- [Project Badges](project_badges.md) - [Project import/export](project_import_export.md) - [Project Members](members.md) - [Project Snippets](project_snippets.md) |