diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2018-03-15 19:58:50 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2018-03-15 19:58:50 +0000 |
| commit | 618b6dd45101cf7f8f6e143259d2b1f25e7c14c2 (patch) | |
| tree | b366dd09a7c01a1b204219bb5980e8d126792ce9 | |
| parent | 770ba3838ce21dd7e788eaf013fb3abd2f5cac91 (diff) | |
| parent | 4161e1f180e1353ba4e5af17c852a33993a254a5 (diff) | |
| download | gitlab-ce-618b6dd45101cf7f8f6e143259d2b1f25e7c14c2.tar.gz | |
Merge branch 'docs-new-fe-guide-style' into 'master'
Rename style to style guide in new frontend guide
See merge request gitlab-org/gitlab-ce!17725
| -rw-r--r-- | doc/development/new_fe_guide/index.md | 2 | ||||
| -rw-r--r-- | doc/development/new_fe_guide/style/index.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/new_fe_guide/index.md b/doc/development/new_fe_guide/index.md index 08c6a266e7f..78931defa24 100644 --- a/doc/development/new_fe_guide/index.md +++ b/doc/development/new_fe_guide/index.md @@ -19,7 +19,7 @@ Guidance on topics related to development. Learn about all the dependencies that make up our frontend, including some of our own custom built libraries. -## [Style](style/index.md) +## [Style guides](style/index.md) Style guides to keep our code consistent. diff --git a/doc/development/new_fe_guide/style/index.md b/doc/development/new_fe_guide/style/index.md index ebee57bebbf..335d9e66240 100644 --- a/doc/development/new_fe_guide/style/index.md +++ b/doc/development/new_fe_guide/style/index.md @@ -1,4 +1,4 @@ -# Style +# Style guides ## [HTML style guide](html.md) |