summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2018-08-21 11:48:10 +0000
committerWinnie Hellmann <winnie@gitlab.com>2018-08-21 11:48:10 +0000
commit96fe727874af01b13db2a6fad7af03fb736d8306 (patch)
tree1c9b398e92f627cf855051552c60b021e9b346e9
parent2b48ff8213d48ed6e72a8dea78649ccb7e05775c (diff)
downloadgitlab-ce-bvl-collaboration-accross-mrs-docs.tar.gz
Adjust wording for Vuex mockingbvl-collaboration-accross-mrs-docs
-rw-r--r--doc/development/collaborating_across_merge_requests.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/development/collaborating_across_merge_requests.md b/doc/development/collaborating_across_merge_requests.md
index 43a47f59b7d..882e3025c77 100644
--- a/doc/development/collaborating_across_merge_requests.md
+++ b/doc/development/collaborating_across_merge_requests.md
@@ -22,9 +22,9 @@ the backend merge request gets merged into master, this second merge
request can be rebased. The second merge request, that introduces the
polished UI for the new feature could then remove the feature flag.
-The same could be done the other way around. If the frontend would get
-it's data from a vuex store, the data could be dummy data in the
-initial state. When the backend is added the dummy data is replaced
+The same can be done the other way around. Instead of making a real request,
+dummy data can be stored in the initial state of the Vuex store.
+When the backend is added the dummy data is replaced
by data coming from an endpoint and the feature flag hiding the UI is
removed.