summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Refactored the states to be rendered via haml and show them via jsadd-error-empty-statesJose Ivan Vargas2017-04-058-110/+121
|
* Simplify empty states text.Jose Ivan Vargas2017-04-041-5/+5
|
* Modified the updateState function and related testsJose Ivan Vargas2017-04-042-19/+28
|
* Added empty line to the metrics.html fixtureJose Ivan Vargas2017-04-041-1/+1
|
* Code cleanup and test fixingJose Ivan Vargas2017-04-046-11/+23
|
* Fixed karma testsJose Ivan Vargas2017-04-042-4/+6
|
* Added HTML to the prometheus states descriptionJose Ivan Vargas2017-04-044-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 testsJose Ivan Vargas2017-04-041-3/+3
|
* Added links to the description text in a couple of statesJose Ivan Vargas2017-04-044-6/+19
| | | | Also added the integration link to the corresponding state
* Added CHANGELOGJose Ivan Vargas2017-04-041-0/+4
|
* Added unit tests for the different statesJose Ivan Vargas2017-04-045-17/+78
| | | | Cleaned up some code
* Introduced empty/error ux states to environments monitoring.Jose Ivan Vargas2017-04-0411-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 Coutable2017-04-045-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 resultsJoren De Groof2017-04-035-3/+9
| | | | | | | | | | The MergeRequestsFinder uses the milestone_title instead of the milestone_id
* | Merge branch 'fix/import-fork' into 'master' Rémy Coutable2017-04-0415-16/+215
|\ \ | | | | | | | | | | | | | | | | | | Fix issues importing forked projects Closes #26184 and #29380 See merge request !9102
| * | Fix issues importing forked projectsJames Lopez2017-04-0415-16/+215
|/ /
* | Merge branch 'issue-boards-scrollbars' into 'master' Filipa Lacerda2017-04-041-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Fixed issue boards having a vertical scrollbar Closes #30209 See merge request !10312
| * | Fixed issue boards having a vertical scrollbarissue-boards-scrollbarsPhil Hughes2017-04-031-2/+2
| | | | | | | | | | | | Closes #30209
* | | Merge branch '30400-fix-blob-highlighting-in-search' into 'master' Sean McGivern2017-04-045-4/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix blob highlighting in search Closes #30400 See merge request !10420
| * | | Fix blob highlighting in searchNick Thomas2017-04-035-4/+35
| | | |
* | | | Merge branch 'workhorse-gitaly-address' into 'master' Sean McGivern2017-04-042-2/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Pass GitalyAddress to workhorse See merge request !10447
| * | | | Pass GitalyAddress to workhorseJacob Vosmaer2017-04-042-2/+9
| | | | |
* | | | | Merge branch 'environment-performance-improvements' into 'master' Filipa Lacerda2017-04-0410-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-improvementsJose Ivan Vargas2017-04-035-142/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | number_utils.js Also improved code formatting
| * | | | | Code corrections with a helper and a variableJose Ivan Vargas2017-04-032-11/+10
| | | | | |
| * | | | | Added a formatRelevantDigits text utilityJose Ivan Vargas2017-04-034-14/+54
| | | | | |
| * | | | | Added CHANGELOGJose Ivan Vargas2017-04-031-0/+4
| | | | | |
| * | | | | Added a number input to provide a way to format the number ofJose Ivan Vargas2017-04-033-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | desired decimals for the cpu metrics
| * | | | | Fixed prometheus_graph_spec.js and scss-lintersJose Ivan Vargas2017-04-032-6/+10
| | | | | |
| * | | | | Legend text is now bolded also the Y legend text has a transparent backgroundJose Ivan Vargas2017-04-032-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | to help differentiate legends
| * | | | | Hover lines are now synced up when hovering in any graphJose Ivan Vargas2017-04-032-67/+76
| | | | | | | | | | | | | | | | | | | | | | | | Cleaned up some code
| * | | | | Readded missing statement from the rebaseJose Ivan Vargas2017-04-031-0/+1
| | | | | |
| * | | | | Added the following ux improvements:Jose Ivan Vargas2017-04-035-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 Lacerda2017-04-0417-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-iconsAnnabel Dunstone Gray2017-04-0317-133/+7
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fix/disable-gitaly-post-receive-pack' into 'master' Robert Speicher2017-04-042-19/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable support for Gitaly PostReceivePack See merge request !10444
| * | | | | | Disable support for Gitaly PostReceivePackfix/disable-gitaly-post-receive-packAhmad Sherif2017-04-042-19/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitaly/issues/172
* | | | | | | Merge branch 'feature/bump-gitaly-server-version' into 'master'Robert Speicher2017-04-041-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-versionAhmad Sherif2017-04-041-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'patch-17' into 'master' Rémy Coutable2017-04-041-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | list recommended version of PostgreSQL See merge request !10190
| * | | | | | | | list recommended version of PostgreSQLBen Bodenmiller2017-04-041-0/+3
|/ / / / / / / /
* | | | | | | | Merge branch '24187-set-git-terminal-prompt-env-var-in-initializer' into ↵Douwe Maan2017-04-042-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-initializerTiago Botelho2017-04-032-0/+5
| | | | | | | | |
* | | | | | | | | Merge branch '29492-useless-queries' into 'master'Sean McGivern2017-04-046-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)mhasbini2017-04-046-0/+64
| | | | | | | | | |
* | | | | | | | | | Merge branch 'zj-kube-service-auto-fill' into 'master' Kamil Trzciński2017-04-044-48/+90
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't autofill kubernetes namespace See merge request !10438
| * | | | | | | | | | Don't autofill kubernetes namespaceZ.J. van de Weg2017-04-044-48/+90
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'backport-es-global-search-difference' into 'master' Sean McGivern2017-04-041-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport differences in global search from EE to CE See merge request !10445
| * | | | | | | | | | | Backport differences in global search from EE to CENick Thomas2017-04-041-1/+5
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '29670-jira-integration-documentation-improvment' into 'master' Achilleas Pipinellis2017-04-043-0/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves Jira integration documentation Closes #29670 See merge request !10067