summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJob van der Voort <job@gitlab.com>2015-05-07 08:36:47 +0000
committerJob van der Voort <job@gitlab.com>2015-05-07 08:36:47 +0000
commit007d4af19c679c38a07087a764e3685e8e51a8eb (patch)
treec886c21499d45c05e8e86bd94fc649b7d43b782f
parentb18dfc8d40269d3770a432ecf28416736f7bf8d7 (diff)
parent72aa9dd76840f74aa42fe88b7d09722577b2418b (diff)
downloadgitlab-ce-007d4af19c679c38a07087a764e3685e8e51a8eb.tar.gz
Merge branch 'Added_link_reset_root_password' into 'master'
Added link reset root password Added text to link "How to reset root password" cc/ @sytse See merge request !1799
-rw-r--r--doc/security/README.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/security/README.md b/doc/security/README.md
index 49dfa6eec76..1ca45fd0c0a 100644
--- a/doc/security/README.md
+++ b/doc/security/README.md
@@ -4,3 +4,4 @@
- [Rack attack](rack_attack.md)
- [Web Hooks and insecure internal web services](webhooks.md)
- [Information exclusivity](information_exclusivity.md)
+- [Reset your root password] (https://dev.gitlab.org/gitlab/gitlabhq/blob/How_to_Reset_your_root_password/doc/security/reset_root_password.md) \ No newline at end of file