diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 12:07:59 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 12:07:59 +0300 |
commit | a325f3a104748ecc68df7c3d793940aa709a111f (patch) | |
tree | b3bce12be64ab2d9e31627dacd059165819797a3 /doc/development/fe_guide | |
parent | 8fb943c7df5f2b399caaeaebd6c00d0630bc763c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/fe_guide')
-rw-r--r-- | doc/development/fe_guide/development_process.md | 2 | ||||
-rw-r--r-- | doc/development/fe_guide/graphql.md | 2 | ||||
-rw-r--r-- | doc/development/fe_guide/vuex.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/development/fe_guide/development_process.md b/doc/development/fe_guide/development_process.md index 5b02098f020..64bc01c181c 100644 --- a/doc/development/fe_guide/development_process.md +++ b/doc/development/fe_guide/development_process.md @@ -71,7 +71,7 @@ With the purpose of being [respectful of others' time](https://about.gitlab.com/ - includes tests - includes a changelog entry (when necessary) - Before assigning to a maintainer, assign to a reviewer. -- If you assigned a merge request, or pinged someone directly, keep in mind that we work in different timezones and asynchronously, so be patient. Unless the merge request is urgent (like fixing a broken master), please don't DM or reassign the merge request before waiting for a 24-hour window. +- If you assigned a merge request or pinged someone directly, be patient because we work in different timezones and asynchronously. Unless the merge request is urgent (like fixing a broken master), please don't DM or reassign the merge request before waiting for a 24-hour window. - If you have a question regarding your merge request/issue, make it on the merge request/issue. When we DM each other, we no longer have a SSOT and [no one else is able to contribute](https://about.gitlab.com/handbook/values/#public-by-default). - When you have a big WIP merge request with many changes, you're advised to get the review started before adding/removing significant code. Make sure it is assigned well before the release cut-off, as the reviewer(s)/maintainer(s) would always prioritize reviewing finished MRs before WIP ones. - Make sure to remove the WIP title before the last round of review. diff --git a/doc/development/fe_guide/graphql.md b/doc/development/fe_guide/graphql.md index a9821edff0b..d21c937bfe4 100644 --- a/doc/development/fe_guide/graphql.md +++ b/doc/development/fe_guide/graphql.md @@ -53,7 +53,7 @@ fragment DesignListItem on Design { } ``` -Fragments can be stored in separate files, imported and used in queries, mutations or other fragments. +Fragments can be stored in separate files, imported and used in queries, mutations, or other fragments. ```javascript #import "./designList.fragment.graphql" diff --git a/doc/development/fe_guide/vuex.md b/doc/development/fe_guide/vuex.md index 0bb9e3b7d50..cd18091abdf 100644 --- a/doc/development/fe_guide/vuex.md +++ b/doc/development/fe_guide/vuex.md @@ -6,7 +6,7 @@ _Note:_ All of the below is explained in more detail in the official [Vuex docum ## Separation of concerns -Vuex is composed of State, Getters, Mutations, Actions and Modules. +Vuex is composed of State, Getters, Mutations, Actions, and Modules. When a user clicks on an action, we need to `dispatch` it. This action will `commit` a mutation that will change the state. _Note:_ The action itself will not update the state, only a mutation should update the state. |