diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/development/fe_guide/testing.md | 13 | ||||
-rw-r--r-- | doc/user/project/integrations/img/merge_request_performance.png | bin | 0 -> 66775 bytes | |||
-rw-r--r-- | doc/user/project/integrations/prometheus.md | 10 | ||||
-rw-r--r-- | doc/user/project/pipelines/job_artifacts.md | 4 | ||||
-rw-r--r-- | doc/user/search/img/filter_issues_project.gif | bin | 1430218 -> 0 bytes | |||
-rw-r--r-- | doc/user/search/img/issue_search_filter.png | bin | 0 -> 69559 bytes | |||
-rw-r--r-- | doc/user/search/index.md | 8 |
7 files changed, 24 insertions, 11 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/project/integrations/img/merge_request_performance.png b/doc/user/project/integrations/img/merge_request_performance.png Binary files differnew file mode 100644 index 00000000000..93b2626fed7 --- /dev/null +++ b/doc/user/project/integrations/img/merge_request_performance.png diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md index b71d6981d1e..7aa6d070a1b 100644 --- a/doc/user/project/integrations/prometheus.md +++ b/doc/user/project/integrations/prometheus.md @@ -171,11 +171,15 @@ after initial deployment. ## Determining performance impact of a merge -> [Introduced][ce-10408] in GitLab 9.1. +> [Introduced][ce-10408] in GitLab 9.2. -After a merge request has been approved, a sparkline will appear on the merge request page displaying the average memory usage of the application. The sparkline includes thirty minutes of data prior to the merge, a dot to indicate the merge itself, and then will begin capturing thirty minutes of data after the merge. +Developers can view the performance impact of their changes within the merge request workflow. When a source branch has been deployed to an environment, a sparkline will appear showing the average memory consumption of the app. The dot indicates when the current changes were deployed, with up to 30 minutes of performance data displayed before and after. The sparkline will be updated after each commit has been deployed. -This sparkline serves as a quick indicator of the impact on memory consumption of the recently merged changes. If there is a problem, action can then be taken to troubleshoot or revert the merge. +Once merged and the target branch has been redeployed, the sparkline will switch to show the new environments this revision has been deployed to. + +Performance data will be available for the duration it is persisted on the Prometheus server. + +![Merge Request with Performance Impact](img/merge_request_performance.png) ## Troubleshooting diff --git a/doc/user/project/pipelines/job_artifacts.md b/doc/user/project/pipelines/job_artifacts.md index 5ce99843301..151ee4728ad 100644 --- a/doc/user/project/pipelines/job_artifacts.md +++ b/doc/user/project/pipelines/job_artifacts.md @@ -41,6 +41,10 @@ For more examples on artifacts, follow the artifacts reference in ## Browsing job artifacts +>**Note:** +With GitLab 9.2, PDFs, images, videos and other formats can be previewed directly +in the job artifacts browser without the need to download them. + After a job finishes, if you visit the job's specific page, you can see that there are two buttons. One is for downloading the artifacts archive and the other for browsing its contents. diff --git a/doc/user/search/img/filter_issues_project.gif b/doc/user/search/img/filter_issues_project.gif Binary files differdeleted file mode 100644 index d547588be5d..00000000000 --- a/doc/user/search/img/filter_issues_project.gif +++ /dev/null diff --git a/doc/user/search/img/issue_search_filter.png b/doc/user/search/img/issue_search_filter.png Binary files differnew file mode 100644 index 00000000000..f357abd6bac --- /dev/null +++ b/doc/user/search/img/issue_search_filter.png 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 |