Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-15

8282f507 · GitLab Bot · 425413f8 · 75b6ed8d · 8282f507
Commit 8282f507 authored Oct 15, 2018 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

doc/development/README.md doc/development/README.md +1 -0

No files found.
--- a/doc/development/README.md
+++ b/doc/development/README.md
@@ -52,6 +52,7 @@ description: 'Learn how to contribute to GitLab.'
 - [Permissions](permissions.md)
 - [Prometheus metrics](prometheus_metrics.md)
 - [Guidelines for reusing abstractions](reusing_abstractions.md)
+- [DeclarativePolicy framework](policies.md)

 ## Performance guides