summaryrefslogtreecommitdiff
path: root/doc/development
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-04 09:09:16 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-04 09:09:16 +0000
commit7ea6cb331a8d50e201ef5da34dcfd62b93760c5b (patch)
tree1a4145ef8500214150cd6b6c004d737016b1bdc0 /doc/development
parente3bdfa1a13d7e6c92716324c78b5b20c07eeb7c6 (diff)
downloadgitlab-ce-7ea6cb331a8d50e201ef5da34dcfd62b93760c5b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development')
-rw-r--r--doc/development/fe_guide/index.md2
-rw-r--r--doc/development/fe_guide/style/index.md2
-rw-r--r--doc/development/new_fe_guide/development/components.md2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/development/fe_guide/index.md b/doc/development/fe_guide/index.md
index 4e599049470..790cd94cec4 100644
--- a/doc/development/fe_guide/index.md
+++ b/doc/development/fe_guide/index.md
@@ -85,7 +85,7 @@ See the relevant style guides for our guidelines and for information on linting:
- [JavaScript](style/javascript.md). Our guide is based on
the excellent [Airbnb][airbnb-js-style-guide] style guide with a few small
changes.
-- [SCSS](style/scss.md): our SCSS conventions which are enforced through [`scss-lint`](https://github.com/brigade/scss-lint).
+- [SCSS](style/scss.md): our SCSS conventions which are enforced through [`scss-lint`](https://github.com/sds/scss-lint).
- [HTML](style/html.md). Guidelines for writing HTML code consistent with the rest of the codebase.
- [Vue](style/vue.md). Guidelines and conventions for Vue code may be found here.
diff --git a/doc/development/fe_guide/style/index.md b/doc/development/fe_guide/style/index.md
index 3b07a8557f5..8d70d4db893 100644
--- a/doc/development/fe_guide/style/index.md
+++ b/doc/development/fe_guide/style/index.md
@@ -10,7 +10,7 @@ changes.
## SCSS style guide
-Our [SCSS conventions](scss.md) which are enforced through [`scss-lint`](https://github.com/brigade/scss-lint).
+Our [SCSS conventions](scss.md) which are enforced through [`scss-lint`](https://github.com/sds/scss-lint).
## HTML style guide
diff --git a/doc/development/new_fe_guide/development/components.md b/doc/development/new_fe_guide/development/components.md
index 7cccd4b5b1b..b7233f5d7c0 100644
--- a/doc/development/new_fe_guide/development/components.md
+++ b/doc/development/new_fe_guide/development/components.md
@@ -12,7 +12,7 @@ We chose D3 as our library going forward because of the following features:
D3 is very popular across many projects outside of GitLab:
- [The New York Times](https://archive.nytimes.com/www.nytimes.com/interactive/2012/02/13/us/politics/2013-budget-proposal-graphic.html)
-- [plot.ly](https://plot.ly/)
+- [plot.ly](https://plotly.com/)
- [Droptask](https://www.ayoa.com/previously-droptask/)
Within GitLab, D3 has been used for the following notable features