summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-02-11 18:50:22 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-02-11 18:50:22 +0000
commit07faf8144a63ad6effe63eac6cc0d02a1d67d6c3 (patch)
tree9d6a9e5eb5c3b497f86156ee3e66c88eb5fd2aaa
parent95d16e75a385e8c2effc79646951dd67c6b080ad (diff)
parentdb868e4bfe362872e8440faf6c5d6b28f5609c8f (diff)
downloadgitlab-ce-07faf8144a63ad6effe63eac6cc0d02a1d67d6c3.tar.gz
Merge branch 'fix_markdown_image_link' into 'master'
Add a new image in the markdown help page Previously we were linking directly from the public/ directory. While this worked for the GitLab help page, it was not working for doc.gitlab.com. Adding an image in a relative directory and linking from there serves both ends. Fixes #13233 See merge request !2790
-rw-r--r--doc/markdown/img/logo.pngbin0 -> 11097 bytes
-rw-r--r--doc/markdown/markdown.md8
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/markdown/img/logo.png b/doc/markdown/img/logo.png
new file mode 100644
index 00000000000..7da5f23ed9b
--- /dev/null
+++ b/doc/markdown/img/logo.png
Binary files differ
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index f6bffba9fdb..c400cdac64d 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -424,24 +424,24 @@ will point the link to `wikis/style` when the link is inside of a wiki markdown
Here's our logo (hover to see the title text):
Inline-style:
- ![alt text](assets/logo.svg)
+ ![alt text](img/logo.png)
Reference-style:
![alt text1][logo]
- [logo]: assets/logo.svg
+ [logo]: img/logo.png
Here's our logo:
Inline-style:
-![alt text](/assets/logo.svg)
+![alt text](img/logo.png)
Reference-style:
![alt text][logo]
-[logo]: /assets/logo.svg
+[logo]: img/logo.png
## Blockquotes