summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-04-19 10:39:05 +0100
committerFilipa Lacerda <filipa@gitlab.com>2017-04-19 10:39:05 +0100
commit2a328a0ee5fbdc43100baf7ac153ae9322d8b3f1 (patch)
tree14df7c5543b9bf61e557e4c97342cf028849900b
parent18e4f13c0717914709095f9b9664bfa2aba3b11f (diff)
downloadgitlab-ce-steps-to-MR.tar.gz
Diagram renders in a new line.steps-to-MR
Remove extra blankspace
-rw-r--r--doc/development/fe_guide/index.md4
-rw-r--r--doc/development/fe_guide/vue.md11
2 files changed, 9 insertions, 6 deletions
diff --git a/doc/development/fe_guide/index.md b/doc/development/fe_guide/index.md
index b2a6189ff83..c9dd9f45abf 100644
--- a/doc/development/fe_guide/index.md
+++ b/doc/development/fe_guide/index.md
@@ -59,13 +59,15 @@ branch from `new-feature`, let's call it `new-feature-step-2` and repeat the pro
**Tips**
- Make sure `new-feature` branch is always synced with `master`: merge master frequently.
- Do the same for the feature branch you have opened. This can be accomplished by merging `master` into `new-feature` and `new-feature` into `new-feature-step-*`
-- Avoid rewriting history.
+- Avoid rewriting history.
### Share your work early
1. Before writing code guarantee your vision of the architecture is aligned with
GitLab's architecture.
1. Add a diagram to the issue and ask a Frontend Architecture about it.
+
![Diagram of Issue Boards Architecture](img/boards_diagram.png)
+
1. Don't take more than one week between starting work on a feature and
sharing a Merge Request with a reviewer or a maintainer.
diff --git a/doc/development/fe_guide/vue.md b/doc/development/fe_guide/vue.md
index 07b34cb4773..45c8300d9de 100644
--- a/doc/development/fe_guide/vue.md
+++ b/doc/development/fe_guide/vue.md
@@ -345,8 +345,6 @@ describe('Todos App', () => {
it('should render todos', (done) => {
-
-
setTimeout(() => {
expect(vm.$el.querySelectorAll('.js-todo-list div').length).toBe(1);
done();
@@ -397,8 +395,11 @@ the response we need:
Vue.http.interceptors = _.without(Vue.http.interceptors, interceptor);
});
- it('should do something', () => {
- // Test received data
+ it('should do something', (done) => {
+ setTimeout(() => {
+ // Test received data
+ done();
+ }, 0);
});
```
@@ -413,4 +414,4 @@ the response we need:
[vue-resource-repo]: https://github.com/pagekit/vue-resource
[vue-resource-interceptor]: https://github.com/pagekit/vue-resource/blob/develop/docs/http.md#interceptors
[issue-boards-service]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/assets/javascripts/boards/services/board_service.js.es6
-[flux]: https://facebook.github.io/flux/
+[flux]: https://facebook.github.io/flux