Add latest changes from gitlab-org/gitlab@master

6 files changed, 15 insertions, 15 deletions

diff --git a/doc/development/fe_guide/development_process.md b/doc/development/fe_guide/development_process.md
index 92f3c82a6ea..6e078f097cd 100644
--- a/doc/development/fe_guide/development_process.md
+++ b/doc/development/fe_guide/development_process.md
@@ -10,9 +10,9 @@ Copy the content over to your issue or merge request and if something doesn't ap
 
 This checklist is intended to help us during development of bigger features/refactorings, it's not a "use it always and every point always matches" list.
 
-Please use your best judgement when to use it and please contribute new points through merge requests if something comes to your mind.
+Please use your best judgment when to use it and please contribute new points through merge requests if something comes to your mind.
 
-```
+```markdown
 ### Frontend development
 
 #### Planning development
diff --git a/doc/development/fe_guide/graphql.md b/doc/development/fe_guide/graphql.md
index a8c78903612..620ed06765c 100644
--- a/doc/development/fe_guide/graphql.md
+++ b/doc/development/fe_guide/graphql.md
@@ -149,7 +149,7 @@ Using local Apollo Cache is handy when we have a need to mock some GraphQL API r
 
 For example, we have a [fragment](#fragments) on `DesignVersion` used in our queries:
 
-```
+```javascript
 fragment VersionListItem on DesignVersion {
   id
   sha
@@ -158,7 +158,7 @@ fragment VersionListItem on DesignVersion {
 
 We need to fetch also version author and the 'created at' property to display them in the versions dropdown but these changes are still not implemented in our API. We can change the existing fragment to get a mocked response for these new fields:
 
-```
+```javascript
 fragment VersionListItem on DesignVersion {
   id
   sha
diff --git a/doc/development/fe_guide/style/vue.md b/doc/development/fe_guide/style/vue.md
index 8f69792287b..b571707edfd 100644
--- a/doc/development/fe_guide/style/vue.md
+++ b/doc/development/fe_guide/style/vue.md
@@ -294,7 +294,7 @@ Please check this [rules](https://github.com/vuejs/eslint-plugin-vue#bulb-rules)
 
 1. Tag order in `.vue` file
 
-   ```
+   ```html
    <script>
      // ...
    </script>
diff --git a/doc/development/fe_guide/tooling.md b/doc/development/fe_guide/tooling.md
index 066c2575e2d..0e8f5ed05ed 100644
--- a/doc/development/fe_guide/tooling.md
+++ b/doc/development/fe_guide/tooling.md
@@ -64,36 +64,36 @@ The easiest way to include prettier in your workflow is by setting up your prefe
 
 Please take care that you only let Prettier format the same file types as the global Yarn script does (.js, .vue, and .scss). In VSCode by example you can easily exclude file formats in your settings file:
 
-```
+```json
   "prettier.disableLanguages": [
       "json",
       "markdown"
-  ],
+  ]
 ```
 
 ### Yarn Script
 
 The following yarn scripts are available to do global formatting:
 
-```
+```shell
 yarn prettier-staged-save
 ```
 
 Updates all currently staged files (based on `git diff`) with Prettier and saves the needed changes.
 
-```
+```shell
 yarn prettier-staged
 ```
 
 Checks all currently staged files (based on `git diff`) with Prettier and log which files would need manual updating to the console.
 
-```
+```shell
 yarn prettier-all
 ```
 
 Checks all files with Prettier and logs which files need manual updating to the console.
 
-```
+```shell
 yarn prettier-all-save
 ```
 
@@ -103,13 +103,13 @@ The source of these Yarn scripts can be found in `/scripts/frontend/prettier.js`
 
 #### Scripts during Conversion period
 
-```
+```shell
 node ./scripts/frontend/prettier.js check-all ./vendor/
 ```
 
 This will go over all files in a specific folder check it.
 
-```
+```shell
 node ./scripts/frontend/prettier.js save-all ./vendor/
 ```
 
diff --git a/doc/development/fe_guide/vue.md b/doc/development/fe_guide/vue.md
index 96bc89675fe..aeedd57fd83 100644
--- a/doc/development/fe_guide/vue.md
+++ b/doc/development/fe_guide/vue.md
@@ -25,7 +25,7 @@ In some features implemented with Vue.js, like the [issue board][issue-boards]
 or [environments table][environments-table]
 you can find a clear separation of concerns:
 
-```
+```plaintext
 new_feature
 ├── components
 │   └── component.vue
diff --git a/doc/development/fe_guide/vuex.md b/doc/development/fe_guide/vuex.md
index fd8ba0297c5..65661b0cc3b 100644
--- a/doc/development/fe_guide/vuex.md
+++ b/doc/development/fe_guide/vuex.md
@@ -22,7 +22,7 @@ _Note:_ The action itself will not update the state, only a mutation should upda
 
 When using Vuex at GitLab, separate these concerns into different files to improve readability:
 
-```
+```plaintext
 └── store
   ├── index.js          # where we assemble modules and export the store
   ├── actions.js        # actions