summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-11-29 13:08:28 +0000
committerRémy Coutable <remy@rymai.me>2016-11-29 13:08:28 +0000
commitb8f9949a70005978e83a3aaffbe0836c75d24b74 (patch)
tree9f0e75f3979ff059c185c2920e6b2523fc400e74
parent35e6c2baca12d3aaf6bf2ee69c43d0874341c0ce (diff)
parentac761e450919b7a2d2dd76e08afe2a877e878e61 (diff)
downloadgitlab-ce-b8f9949a70005978e83a3aaffbe0836c75d24b74.tar.gz
Merge branch 'readme-link-fix' into 'master'
Fix broken README.md UX guide link. See merge request !7805
-rw-r--r--README.md2
-rw-r--r--changelogs/unreleased/readme-link-fix.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/README.md b/README.md
index f63543ca39d..c9bb5af6da2 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ For more information please see the [architecture documentation](https://docs.gi
## UX design
-Please adhere to the [UX Guide](doc/development/ux_guide/readme.md) when creating designs and implementing code.
+Please adhere to the [UX Guide](doc/development/ux_guide/index.md) when creating designs and implementing code.
## Third-party applications
diff --git a/changelogs/unreleased/readme-link-fix.yml b/changelogs/unreleased/readme-link-fix.yml
new file mode 100644
index 00000000000..211d3b80c3a
--- /dev/null
+++ b/changelogs/unreleased/readme-link-fix.yml
@@ -0,0 +1,4 @@
+---
+title: Fix broken README.md UX guide link.
+merge_request:
+author: