Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/development/fe_guide/testing.md13
-rw-r--r--doc/user/search/img/filter_issues_project.gifbin1430218 -> 0 bytes
-rw-r--r--doc/user/search/img/issue_search_filter.pngbin0 -> 69559 bytes
-rw-r--r--doc/user/search/index.md8
4 files changed, 13 insertions, 8 deletions
diff --git a/doc/development/fe_guide/testing.md b/doc/development/fe_guide/testing.md
index 5c6bdc97ef6..0ef9fc61a61 100644
--- a/doc/development/fe_guide/testing.md
+++ b/doc/development/fe_guide/testing.md
@@ -74,7 +74,7 @@ When testing Promises you should always make sure that the test is asynchronous
Your Promise chain should therefore end with a call of the `done` callback and `done.fail` in case an error occurred.
```javascript
-/// Good
+// Good
it('tests a promise', (done) => {
promise
.then((data) => {
@@ -84,9 +84,10 @@ it('tests a promise', (done) => {
.catch(done.fail);
});
-/// Good
+// Good
it('tests a promise rejection', (done) => {
promise
+ .then(done.fail)
.catch((error) => {
expect(error).toBe(expectedError);
})
@@ -94,7 +95,7 @@ it('tests a promise rejection', (done) => {
.catch(done.fail);
});
-/// Bad (missing done callback)
+// Bad (missing done callback)
it('tests a promise', () => {
promise
.then((data) => {
@@ -102,7 +103,7 @@ it('tests a promise', () => {
})
});
-/// Bad (missing catch)
+// Bad (missing catch)
it('tests a promise', (done) => {
promise
.then((data) => {
@@ -111,7 +112,7 @@ it('tests a promise', (done) => {
.then(done)
});
-/// Bad (use done.fail in asynchronous tests)
+// Bad (use done.fail in asynchronous tests)
it('tests a promise', (done) => {
promise
.then((data) => {
@@ -121,7 +122,7 @@ it('tests a promise', (done) => {
.catch(fail)
});
-/// Bad (missing catch)
+// Bad (missing catch)
it('tests a promise rejection', (done) => {
promise
.catch((error) => {
diff --git a/doc/user/search/img/filter_issues_project.gif b/doc/user/search/img/filter_issues_project.gif
deleted file mode 100644
index d547588be5d..00000000000
--- a/doc/user/search/img/filter_issues_project.gif
+++ /dev/null
Binary files differ
diff --git a/doc/user/search/img/issue_search_filter.png b/doc/user/search/img/issue_search_filter.png
new file mode 100644
index 00000000000..f357abd6bac
--- /dev/null
+++ b/doc/user/search/img/issue_search_filter.png
Binary files differ
diff --git a/doc/user/search/index.md b/doc/user/search/index.md
index 45f443819ec..6d59dcc6c75 100644
--- a/doc/user/search/index.md
+++ b/doc/user/search/index.md
@@ -34,18 +34,22 @@ a project's **Issues** tab, and click on the field **Search or filter results...
display a dropdown menu, from which you can add filters per author, assignee, milestone, label,
and weight. When done, press **Enter** on your keyboard to filter the issues.
-![filter issues in a project](img/filter_issues_project.gif)
+![filter issues in a project](img/issue_search_filter.png)
The same process is valid for merge requests. Navigate to your project's **Merge Requests** tab,
and click **Search or filter results...**. Merge requests can be filtered by author, assignee,
milestone, and label.
-## Search History
+## Search history
You can view recent searches by clicking on the little arrow-clock icon, which is to the left of the search input. Click the search entry to run that search again. This feature is available for issues and merge requests. Searches are stored locally in your browser.
![search history](img/search_history.gif)
+## Removing search filters
+
+Individual filters can be removed by clicking on the filter's (x) button or backspacing. The entire search filter can be cleared by clicking on the search box's (x) button.
+
### Shortcut
You'll also find a shortcut on the search field on the top-right of the project's dashboard to