diff options
| author | Martin Wortschack <mwortschack@gitlab.com> | 2018-09-11 08:43:10 +0200 |
|---|---|---|
| committer | Martin Wortschack <mwortschack@gitlab.com> | 2018-09-11 08:43:10 +0200 |
| commit | a2f7936c74e6c9c4eed7b1c5641f0c43d4ff1375 (patch) | |
| tree | 82b1ea27fe2a9a1be884467e10d9bde688ce97d1 /doc/development/README.md | |
| parent | bfd2181310097f5c0a92a43ffc2b7b9540b96ad3 (diff) | |
| parent | 2f990e3408d00cad473d8dcf8a4e49155cc3cc33 (diff) | |
| download | gitlab-ce-a2f7936c74e6c9c4eed7b1c5641f0c43d4ff1375.tar.gz | |
merge master and resolve conflicts
Diffstat (limited to 'doc/development/README.md')
| -rw-r--r-- | doc/development/README.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/development/README.md b/doc/development/README.md index 20f8fa1d368..b37403552fe 100644 --- a/doc/development/README.md +++ b/doc/development/README.md @@ -47,6 +47,8 @@ description: 'Learn how to contribute to GitLab.' - [How to dump production data to staging](db_dump.md) - [Working with the GitHub importer](github_importer.md) - [Working with Merge Request diffs](diffs.md) +- [Permissions](permissions.md) +- [Prometheus metrics](prometheus_metrics.md) ## Performance guides |