summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 'master' into 'master' Rémy Coutable2017-04-031-1/+1
|\ | | | | | | | | fix spelling CI_REPOSITORY_URL (line:355) gitab-ci-token to gitlab-ci-token. See merge request !10409
| * fix spelling CI_REPOSITORY_URL (line:355) gitab-ci-token to gitlab-ci-token. Mustafa YILDIRIM2017-04-031-1/+1
| |
* | Merge branch 'introduce-base-polling-interval' into 'master' Sean McGivern2017-04-0313-7/+146
|\ \ | | | | | | | | | | | | | | | | | | Introduce "polling_interval_multiplier" as application setting Closes #29759 See merge request !10280
| * | Introduce "polling_interval_multiplier" as application settingAdam Niedzielski2017-04-0313-7/+146
| | | | | | | | | | | | | | | Implement module for setting "Poll-Interval" response header. Return 429 in ETag caching middleware when polling is disabled.
* | | Merge branch 'workhorse-gitaly-repository' into 'master' Robert Speicher2017-04-034-6/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Pass Gitaly 'Repository' messages to workhorse for Git HTTP Closes gitaly#148 See merge request !10343
| * | | Pass Gitaly Repository messages to workhorseJacob Vosmaer2017-04-032-3/+17
| | | |
| * | | Use gitaly 0.5.0Jacob Vosmaer2017-04-032-3/+3
| | | |
* | | | Merge branch '29541-fix-github-importer-deleted-fork' into 'master' Robert Speicher2017-04-035-23/+73
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GitHub importer for PRs of deleted forked repositories Closes #29541 See merge request !9992
| * | | | Fix specs29541-fix-github-importer-deleted-forkGabriel Mazetto2017-04-031-1/+1
| | | | |
| * | | | Improve specs examplesGabriel Mazetto2017-04-031-3/+3
| | | | |
| * | | | Minor refactorGabriel Mazetto2017-04-032-12/+7
| | | | |
| * | | | Fix BrachFormatter for removed usersDouglas Barbosa Alexandre2017-04-031-1/+1
| | | | |
| * | | | ChangelogGabriel Mazetto2017-04-031-0/+4
| | | | |
| * | | | Fix specsGabriel Mazetto2017-04-031-2/+2
| | | | |
| * | | | One more change to the branch names to preserve metadataGabriel Mazetto2017-04-032-9/+9
| | | | |
| * | | | Prefixes source branch name with short SHA to avoid collisionDouglas Barbosa Alexandre2017-04-033-18/+28
| | | | |
| * | | | Fix GitHub importer for PRs of deleted forked repositoriesGabriel Mazetto2017-04-033-4/+45
| | | | |
* | | | | Merge branch 'sh-fix-destroy-user-race' into 'master' Douwe Maan2017-04-037-12/+48
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix race condition where a namespace would be deleted before a project was deleted Closes #30334 and #30306 See merge request !10389
| * | | | | Delete users asynchronouslysh-fix-destroy-user-raceStan Hu2017-04-024-8/+24
| | | | | |
| * | | | | Fix race condition where a namespace would be deleted before a project was ↵Stan Hu2017-04-023-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deleted When deleting a user, the following sequence could happen: 1. Project `mygroup/myproject` is scheduled for deletion 2. The group `mygroup` is deleted 3. Sidekiq worker runs to delete `mygroup/myproject`, but the namespace and routes have been destroyed. Closes #30334
* | | | | | Merge branch 'fix-nplusone-queries' into 'master' Robert Speicher2017-04-034-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a few N+1 queries identified by Bullet See merge request !10361
| * | | | | | Fix a few N+1 queries identified by Bulletfix-nplusone-queriesStan Hu2017-04-024-1/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | See !10263
* | | | | | Merge branch 'bvl-cleanup-repos' into 'master' Robert Speicher2017-04-031-2/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Fix warning when trying to clone repo that already existed See merge request !10367
| * | | | | Fix warning when cloning repo that already existsbvl-cleanup-reposBob Van Landuyt2017-04-021-2/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | fixes the warning: fatal: destination path '~/gitlab-ce/gitlab/tmp/tests/gitlab-test-fork_bare' already exists and is not an empty directory.
* | | | | Merge branch '30211-fix-transient-failure' into 'master' Sean McGivern2017-04-031-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix a transient failure caused by FFaker Closes #30211 See merge request !10404
| * | | | Fix a transient failure caused by FFaker30211-fix-transient-failureRémy Coutable2017-04-031-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | The error occurs when the Ffaker-generate title or description of issue3 contains git, e.g. fugit in this case. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'sh-relax-wiki-slug-constraint' into 'master' Rémy Coutable2017-04-032-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relax constraint on Wiki IDs, since subdirectories can contain spaces Closes #30357 See merge request !10396
| * | | | Relax constraint on Wiki IDs, since subdirectories can contain spacessh-relax-wiki-slug-constraintStan Hu2017-04-022-3/+5
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | If a subdirectory contains spaces, GitLab would be unable to generate the route in the sidebar, resulting in an Error 500. Closes #30357
* | | | Merge branch 'sh-fix-todos-spinach-failure' into 'master' Rémy Coutable2017-04-031-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a wait_for_ajax call to ensure Todos page cleans up properly See merge request !10398
| * | | | Add a wait_for_ajax call to ensure Todos page cleans up properlysh-fix-todos-spinach-failureStan Hu2017-04-021-0/+3
| |/ / / | | | | | | | | | | | | Potentially fixes intermittent failures such as https://gitlab.com/gitlab-org/gitlab-ce/builds/13484375
* | | | Merge branch '30264-fix-vue-pagination' into 'master' Fatih Acet2017-04-035-10/+79
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes method not replacing URL parameters correctly Closes #30264 See merge request !10351
| * | | | Change order of specsFilipa Lacerda2017-04-031-41/+42
| | | | |
| * | | | Clean history after every test that changes historyFilipa Lacerda2017-04-033-0/+16
| | | | |
| * | | | Clean history state after each testFilipa Lacerda2017-04-031-0/+5
| | | | |
| * | | | Fixes method not replacing URL parameters correctlyFilipa Lacerda2017-04-033-10/+57
| | |/ / | |/| |
* | | | Merge branch '29669-redirect-referer-params' into 'master' Rémy Coutable2017-04-033-1/+21
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fix redirection after login when the referer have params Closes #29669 See merge request !10397
| * | | Fix redirection after login when the referer have paramsmhasbini2017-04-023-1/+21
| | |/ | |/|
* | | Merge branch 'todo-update-order' into 'master' Yorick Peterse2017-04-032-1/+5
|\ \ \ | |_|/ |/| | | | | | | | Remove unnecessary ORDER BY clause when updating todos See merge request !10399
| * | Remove unnecessary ORDER BY clause when updating todosmhasbini2017-04-022-1/+5
| |/
* | Merge branch 'use-gitaly-commit-is-ancestor' into 'master' Robert Speicher2017-04-025-1/+43
|\ \ | | | | | | | | | | | | Use gitaly commit is ancestor See merge request !9864
View Lorry Controller Status