Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-docs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-12-16 09:47:33 +0300
committerAchilleas Pipinellis <axil@gitlab.com>2019-12-16 09:47:33 +0300
commit6359af9a7e0d1d09b822dfc64e531ded9852f00b (patch)
treed8e163826684d2911e606b2cbb75a039e0604fbc
parent12e9947908a04927d1c95aa9ebf2fc381a7e09d1 (diff)
parent51f42c9d5c591a7c230d35bf5d7e9b9329162369 (diff)
Merge branch 'eread/fix-build-badge' into 'master'
Fix pipeline badge See merge request gitlab-org/gitlab-docs!649
-rw-r--r--README.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/README.md b/README.md
index ac441f8d..29981c01 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-[![build status](https://gitlab.com/gitlab-org/gitlab-docs/badges/master/build.svg)](https://gitlab.com/gitlab-com/gitlab-docs/commits/master)
-
# GitLab Documentation
+[![build status](https://gitlab.com/gitlab-org/gitlab-docs/badges/master/pipeline.svg)](https://gitlab.com/gitlab-org/gitlab-docs/commits/master)
+
This project hosts the repository used to generate the GitLab
documentation website and deployed to https://docs.gitlab.com. It uses the
[Nanoc](http://nanoc.ws) static site generator.
@@ -343,9 +343,9 @@ we reference the array with a symbol (`:versions`).
## Modern JavaScript
Currently a lot of the JavaScript can be found in [content/assets/javascripts/](/content/assets/javascripts). The files in
- this directory are handcrafted `ES5` JavaScript files.
-
-We've [recently introduced](https://gitlab.com/gitlab-org/gitlab-docs/merge_requests/577) the ability to write modern
+ this directory are handcrafted `ES5` JavaScript files.
+
+We've [recently introduced](https://gitlab.com/gitlab-org/gitlab-docs/merge_requests/577) the ability to write modern
JavaScript. All modern JavaScript should be added to the [content/frontend/](/content/frontend) directory.
### Adding a new bundle
@@ -361,7 +361,7 @@ match to make it easier to find:
```
You should replace `<bundle-name>` with whatever you'd like to call your
-bundle.
+bundle.
## Bumping versions of CSS and JavaScript