diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/development/gitaly.md | 2 | ||||
| -rw-r--r-- | doc/development/testing_guide/best_practices.md | 2 | ||||
| -rw-r--r-- | doc/development/testing_guide/end_to_end/quick_start_guide.md | 2 | ||||
| -rw-r--r-- | doc/user/group/index.md | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/doc/development/gitaly.md b/doc/development/gitaly.md index 4ef20d5fd74..c8beb808a54 100644 --- a/doc/development/gitaly.md +++ b/doc/development/gitaly.md @@ -245,7 +245,7 @@ Here are the steps to gate a new feature in Gitaly behind a feature flag. // go implementation } else { findAllTagsRequests.WithLabelValues("ruby").Inc() - // ruby impelmentation + // ruby implementation } ``` diff --git a/doc/development/testing_guide/best_practices.md b/doc/development/testing_guide/best_practices.md index 82439c94c5a..71e3b7740cb 100644 --- a/doc/development/testing_guide/best_practices.md +++ b/doc/development/testing_guide/best_practices.md @@ -17,7 +17,7 @@ our test design. We can find some helpful heuristics documented in the Handbook ## Run tests against MySQL -By default, tests are only run againts PostgreSQL, but you can run them on +By default, tests are only run against PostgreSQL, but you can run them on demand against MySQL by following one of the following conventions: | Convention | Valid example | diff --git a/doc/development/testing_guide/end_to_end/quick_start_guide.md b/doc/development/testing_guide/end_to_end/quick_start_guide.md index afe76acf9c9..9f43f4ebd1c 100644 --- a/doc/development/testing_guide/end_to_end/quick_start_guide.md +++ b/doc/development/testing_guide/end_to_end/quick_start_guide.md @@ -557,7 +557,7 @@ The code should look like this: `filter_output = search_field_tag search_id, nil > Classes starting with `qa-` are used for testing purposes only, and by defining such classes in the elements we add **testability** in the application. -> When defining a class like `qa-labels-block`, it is transformed into `:labels_block` for usage in the Page Objects. So, `qa-edit-link-labels` is tranformed into `:edit_link_labels`, `qa-dropdown-menu-labels` is transformed into `:dropdown_menu_labels`, and `qa-dropdown-input-field` is transformed into `:dropdown_input_field`. Also, we use a [sanity test](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/qa/qa/page#how-did-we-solve-fragile-tests-problem) to check that defined elements have their respective `qa-` selectors in the specified views. +> When defining a class like `qa-labels-block`, it is transformed into `:labels_block` for usage in the Page Objects. So, `qa-edit-link-labels` is transformed into `:edit_link_labels`, `qa-dropdown-menu-labels` is transformed into `:dropdown_menu_labels`, and `qa-dropdown-input-field` is transformed into `:dropdown_input_field`. Also, we use a [sanity test](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/qa/qa/page#how-did-we-solve-fragile-tests-problem) to check that defined elements have their respective `qa-` selectors in the specified views. > We did not define the `qa-labels-block` class in the `app/views/shared/issuable/_sidebar.html.haml` file because it was already there to be used. diff --git a/doc/user/group/index.md b/doc/user/group/index.md index b123a2b917b..97d309caf7c 100644 --- a/doc/user/group/index.md +++ b/doc/user/group/index.md @@ -232,8 +232,8 @@ to explore data such as: From GitLab 10.5, you can transfer groups in the following ways: - Transfer a subgroup to a new parent group. -- Convert a top-level group into a subgroup by transfering it to the desired group. -- Convert a subgroup into a top-level group by transfering it out of its current group. +- Convert a top-level group into a subgroup by transferring it to the desired group. +- Convert a subgroup into a top-level group by transferring it out of its current group. When transferring groups, note: |