| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Refactored the states to be rendered via haml and show them via jsadd-error-empty-states | Jose Ivan Vargas | 2017-04-05 | 8 | -110/+121 |
| | | |||||
| * | Simplify empty states text. | Jose Ivan Vargas | 2017-04-04 | 1 | -5/+5 |
| | | |||||
| * | Modified the updateState function and related tests | Jose Ivan Vargas | 2017-04-04 | 2 | -19/+28 |
| | | |||||
| * | Added empty line to the metrics.html fixture | Jose Ivan Vargas | 2017-04-04 | 1 | -1/+1 |
| | | |||||
| * | Code cleanup and test fixing | Jose Ivan Vargas | 2017-04-04 | 6 | -11/+23 |
| | | |||||
| * | Fixed karma tests | Jose Ivan Vargas | 2017-04-04 | 2 | -4/+6 |
| | | |||||
| * | Added HTML to the prometheus states description | Jose Ivan Vargas | 2017-04-04 | 4 | -23/+18 |
| | | | | | | Also changed some selector to cache a container and removed a global Flash message for 404 and 500 status codes for $.ajax calls | ||||
| * | Fixed Jasmine tests | Jose Ivan Vargas | 2017-04-04 | 1 | -3/+3 |
| | | |||||
| * | Added links to the description text in a couple of states | Jose Ivan Vargas | 2017-04-04 | 4 | -6/+19 |
| | | | | | Also added the integration link to the corresponding state | ||||
| * | Added CHANGELOG | Jose Ivan Vargas | 2017-04-04 | 1 | -0/+4 |
| | | |||||
| * | Added unit tests for the different states | Jose Ivan Vargas | 2017-04-04 | 5 | -17/+78 |
| | | | | | Cleaned up some code | ||||
| * | Introduced empty/error ux states to environments monitoring. | Jose Ivan Vargas | 2017-04-04 | 11 | -32/+102 |
| | | | | | | | | | | | | | Added svg icons for the following states: * loading * unable to connect * getting started Also created a prometheusStates file that contains descriptions, titles, among other options that the state includes Fixed some karma tests | ||||
| * | Merge branch 'bug/api_milestone_merge_requests_scope' into 'master' | Rémy Coutable | 2017-04-04 | 5 | -3/+9 |
| |\ | | | | | | | | | Fixes milestone/merge_request API endpoint to really scope the results See merge request !10369 | ||||
| | * | Fixes milestone/merge_request API endpoint to really scope the results | Joren De Groof | 2017-04-03 | 5 | -3/+9 |
| | | | | | | | | | | | The MergeRequestsFinder uses the milestone_title instead of the milestone_id | ||||
| * | | Merge branch 'fix/import-fork' into 'master' | Rémy Coutable | 2017-04-04 | 15 | -16/+215 |
| |\ \ | | | | | | | | | | | | | | | | | | | Fix issues importing forked projects Closes #26184 and #29380 See merge request !9102 | ||||
| | * | | Fix issues importing forked projects | James Lopez | 2017-04-04 | 15 | -16/+215 |
| |/ / | |||||
| * | | Merge branch 'issue-boards-scrollbars' into 'master' | Filipa Lacerda | 2017-04-04 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | | | | | | | | | | Fixed issue boards having a vertical scrollbar Closes #30209 See merge request !10312 | ||||
| | * | | Fixed issue boards having a vertical scrollbarissue-boards-scrollbars | Phil Hughes | 2017-04-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | Closes #30209 | ||||
| * | | | Merge branch '30400-fix-blob-highlighting-in-search' into 'master' | Sean McGivern | 2017-04-04 | 5 | -4/+35 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix blob highlighting in search Closes #30400 See merge request !10420 | ||||
| | * | | | Fix blob highlighting in search | Nick Thomas | 2017-04-03 | 5 | -4/+35 |
| | | | | | |||||
| * | | | | Merge branch 'workhorse-gitaly-address' into 'master' | Sean McGivern | 2017-04-04 | 2 | -2/+9 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Pass GitalyAddress to workhorse See merge request !10447 | ||||
| | * | | | | Pass GitalyAddress to workhorse | Jacob Vosmaer | 2017-04-04 | 2 | -2/+9 |
| | | | | | | |||||
| * | | | | | Merge branch 'environment-performance-improvements' into 'master' | Filipa Lacerda | 2017-04-04 | 10 | -153/+277 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved Environments Metrics UX Closes #29227 See merge request !9946 | ||||
| | * | | | | | Removed formatRelevantDigits from text_utils.js and added it to a new file ↵environment-performance-improvements | Jose Ivan Vargas | 2017-04-03 | 5 | -142/+169 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | number_utils.js Also improved code formatting | ||||
| | * | | | | | Code corrections with a helper and a variable | Jose Ivan Vargas | 2017-04-03 | 2 | -11/+10 |
| | | | | | | | |||||
| | * | | | | | Added a formatRelevantDigits text utility | Jose Ivan Vargas | 2017-04-03 | 4 | -14/+54 |
| | | | | | | | |||||
| | * | | | | | Added CHANGELOG | Jose Ivan Vargas | 2017-04-03 | 1 | -0/+4 |
| | | | | | | | |||||
| | * | | | | | Added a number input to provide a way to format the number of | Jose Ivan Vargas | 2017-04-03 | 3 | -8/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | desired decimals for the cpu metrics | ||||
| | * | | | | | Fixed prometheus_graph_spec.js and scss-linters | Jose Ivan Vargas | 2017-04-03 | 2 | -6/+10 |
| | | | | | | | |||||
| | * | | | | | Legend text is now bolded also the Y legend text has a transparent background | Jose Ivan Vargas | 2017-04-03 | 2 | -8/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | to help differentiate legends | ||||
| | * | | | | | Hover lines are now synced up when hovering in any graph | Jose Ivan Vargas | 2017-04-03 | 2 | -67/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned up some code | ||||
| | * | | | | | Readded missing statement from the rebase | Jose Ivan Vargas | 2017-04-03 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Added the following ux improvements: | Jose Ivan Vargas | 2017-04-03 | 5 | -30/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add text for the buttons on environment detail page * Reduced the size of the charts * Environment name is now a link Also some general code cleanup | ||||
| * | | | | | | Merge branch 'remove-unused-icons' into 'master' | Filipa Lacerda | 2017-04-04 | 17 | -133/+7 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete unused icons; add empty lines to svg files See merge request !10415 | ||||
| | * | | | | | | Delete unused icons; add empty lines to svg filesremove-unused-icons | Annabel Dunstone Gray | 2017-04-03 | 17 | -133/+7 |
| | | |_|/ / / | |/| | | | | |||||
| * | | | | | | Merge branch 'fix/disable-gitaly-post-receive-pack' into 'master' | Robert Speicher | 2017-04-04 | 2 | -19/+22 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable support for Gitaly PostReceivePack See merge request !10444 | ||||
| | * | | | | | | Disable support for Gitaly PostReceivePackfix/disable-gitaly-post-receive-pack | Ahmad Sherif | 2017-04-04 | 2 | -19/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitaly/issues/172 | ||||
| * | | | | | | | Merge branch 'feature/bump-gitaly-server-version' into 'master' | Robert Speicher | 2017-04-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Gitaly server version to 0.5.0 See merge request !10446 | ||||
| | * | | | | | | | Bump Gitaly server version to 0.5.0feature/bump-gitaly-server-version | Ahmad Sherif | 2017-04-04 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'patch-17' into 'master' | Rémy Coutable | 2017-04-04 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | list recommended version of PostgreSQL See merge request !10190 | ||||
| | * | | | | | | | | list recommended version of PostgreSQL | Ben Bodenmiller | 2017-04-04 | 1 | -0/+3 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch '24187-set-git-terminal-prompt-env-var-in-initializer' into ↵ | Douwe Maan | 2017-04-04 | 2 | -0/+5 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Adds git terminal prompt env var to application rb Closes #24187 See merge request !10372 | ||||
| | * | | | | | | | | adds git terminal prompt env var to application rb24187-set-git-terminal-prompt-env-var-in-initializer | Tiago Botelho | 2017-04-03 | 2 | -0/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch '29492-useless-queries' into 'master' | Sean McGivern | 2017-04-04 | 6 | -0/+64 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove useless queries with false conditions (e.g 1=0) Closes #29492 See merge request !10141 | ||||
| | * | | | | | | | | | Remove useless queries with false conditions (e.g 1=0) | mhasbini | 2017-04-04 | 6 | -0/+64 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'zj-kube-service-auto-fill' into 'master' | Kamil Trzciński | 2017-04-04 | 4 | -48/+90 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't autofill kubernetes namespace See merge request !10438 | ||||
| | * | | | | | | | | | | Don't autofill kubernetes namespace | Z.J. van de Weg | 2017-04-04 | 4 | -48/+90 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'backport-es-global-search-difference' into 'master' | Sean McGivern | 2017-04-04 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport differences in global search from EE to CE See merge request !10445 | ||||
| | * | | | | | | | | | | | Backport differences in global search from EE to CE | Nick Thomas | 2017-04-04 | 1 | -1/+5 |
| | | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch '29670-jira-integration-documentation-improvment' into 'master' | Achilleas Pipinellis | 2017-04-04 | 3 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves Jira integration documentation Closes #29670 See merge request !10067 | ||||
