Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sh-namespace-cleanup-deleted-projects' into 'master' | Douwe Maan | 2017-02-16 | 3 | -3/+15 |
|\ | | | | | | | | | Fix a number of race conditions that can occur during namespace deletion See merge request !9294 | ||||
| * | Fix a number of race conditions that can occur during namespace deletionsh-namespace-cleanup-deleted-projects | Stan Hu | 2017-02-15 | 3 | -3/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two problems in the current implementation: 1. If a project is marked for deletion via the `pending_delete` flag and then the namespace was quickly deleted, it's possible that the namespace skips over that project and leaves that project in an orphaned state. 2. Before namespace deletion, the namespace attempts to clean up all the relevant storage paths. However, if all projects have been removed synchronously, then the namespace will not be able to clean anything. To prevent this, we should load the paths to be deleted before actually destroying projects. The specs were missing this second case due to a permission issue that caused project removal never to happen. | ||||
* | | Merge branch '26957-tanuki-anim-hang' into 'master' | Clement Ho | 2017-02-16 | 3 | -6/+7 |
|\ \ | | | | | | | | | | | | | don't trigger tanuki loader when downloading files See merge request !9290 | ||||
| * | | don't trigger tanuki loader when downloading files26957-tanuki-anim-hang | Simon Knox | 2017-02-16 | 3 | -6/+7 |
| |/ | |||||
* | | Merge branch '27986-text-spacing' into 'master' | Filipa Lacerda | 2017-02-16 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | add space between ci text and commit sha in Merge Request widget Closes #27986 See merge request !9308 | ||||
| * | | add space between ci text and commit sha in Merge Request widget27986-text-spacing | Simon Knox | 2017-02-17 | 1 | -1/+1 |
| |/ | | | | | | | flex parent was pushing elements together | ||||
* | | Merge branch 'fix/import-hooks' into 'master' | Rémy Coutable | 2017-02-16 | 1 | -0/+4 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix import webhooks performance issue Closes #27958 See merge request !9197 | ||||
| * | | Use gitlab shell import instead of manually creating the webhooks | James Lopez | 2017-02-16 | 1 | -0/+4 |
| | | | | | | | | | | | | Also update repo restorer to use project wiki method. | ||||
* | | | Merge branch 'paginate-environments-bundle' into 'master' | Fatih Acet | 2017-02-16 | 22 | -1112/+1326 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Paginate environments bundle Closes #25499 See merge request !9302 | ||||
| * \ \ | Merge branch 'fe-paginated-environments-api' into ↵paginate-environments-bundle | Filipa Lacerda | 2017-02-16 | 22 | -1112/+1326 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'paginate-environments-bundle' Integrate with new environments API See merge request !8954 | ||||
| | * | | | Remove arrow icon from folders | Filipa Lacerda | 2017-02-16 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Create util to handle pagination transformation | Filipa Lacerda | 2017-02-16 | 3 | -18/+17 |
| | | | | | |||||
| | * | | | Changes after review | Filipa Lacerda | 2017-02-16 | 3 | -13/+14 |
| | | | | | |||||
| | * | | | Merge branch 'fe-paginated-environments-api-add-pagination' into ↵ | Filipa Lacerda | 2017-02-16 | 3 | -4/+12 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe-paginated-environments-api-add-subview * fe-paginated-environments-api-add-pagination: Changes after review Rename storePagination to setPagination | ||||
| | | * | | | Changes after reviewfe-paginated-environments-api-add-pagination | Filipa Lacerda | 2017-02-16 | 1 | -2/+10 |
| | | | | | | |||||
| | | * | | | Rename storePagination to setPagination | Filipa Lacerda | 2017-02-16 | 2 | -2/+2 |
| | | | | | | |||||
| | * | | | | Fix broken testsfe-paginated-environments-api-add-subview | Filipa Lacerda | 2017-02-16 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Moves check for latest key to store instead of poluting the view making it ↵ | Filipa Lacerda | 2017-02-15 | 3 | -100/+112 |
| | | | | | | | | | | | | | | | | | | | | | | | | reusable between endpoints. | ||||
| | * | | | | Move change page param to utility function | Filipa Lacerda | 2017-02-15 | 6 | -72/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests Adds folder name in the top of the table | ||||
| | * | | | | Use common util to get parameter name | Filipa Lacerda | 2017-02-15 | 2 | -22/+9 |
| | | | | | | |||||
| | * | | | | Fix underline style | Filipa Lacerda | 2017-02-15 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Adds url for folder; | Filipa Lacerda | 2017-02-15 | 5 | -96/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | Creates new subview to show envirnoments that belong to a folder | ||||
| | * | | | | First iteration | Filipa Lacerda | 2017-02-15 | 4 | -0/+267 |
| | | | | | | |||||
| | * | | | | Extracts table into a reusable component | Filipa Lacerda | 2017-02-15 | 5 | -26/+85 |
| | |/ / / | |||||
| | * | | | Merge branch 'fe-paginated-environments-api' into ↵ | Filipa Lacerda | 2017-02-15 | 1 | -3/+4 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe-paginated-environments-api-add-pagination * fe-paginated-environments-api: Add count keys to response JSON | ||||
| | | * | | | Add count keys to response JSONfe-paginated-environments-api | Z.J. van de Weg | 2017-02-15 | 1 | -3/+4 |
| | | | | | | |||||
| | * | | | | Add pagination tests for environments table | Filipa Lacerda | 2017-02-12 | 2 | -27/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove fdescribe statement Fix conflict | ||||
| | * | | | | Remove spec checking for scope 'all' since it's no longer part of component | Filipa Lacerda | 2017-02-12 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes after review Fix typo | ||||
| | * | | | | Integrates pagination component with API | Filipa Lacerda | 2017-02-12 | 5 | -23/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds pagination tests Remove misplaced comment Fix broken store test | ||||
| | * | | | | Verify `latest` key is present when needed | Filipa Lacerda | 2017-02-12 | 1 | -0/+12 |
| | | | | | | |||||
| | * | | | | Adds pagination component | Filipa Lacerda | 2017-02-12 | 2 | -2/+36 |
| | |/ / / | |||||
| | * | | | Fix typo | Filipa Lacerda | 2017-02-12 | 1 | -12/+12 |
| | | | | | |||||
| | * | | | Fix broken path | Filipa Lacerda | 2017-02-12 | 1 | -25/+83 |
| | | | | | |||||
| | * | | | Merge branch 'master' into fe-paginated-environments-api | Filipa Lacerda | 2017-02-12 | 87 | -356/+428 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (97 commits) convert js-cookie dependency to an npm module convert timeago.js dependency to an npm module remove vue from vendor since it is now in node_modules Add CHANGELOG file Stylize blockquote in notification emails Add js prefix to right sidebar Replace accidentally deleted metaclick Remove right padding from navbar-collapse on large screens Add changelog common_utils merge conflicts Set sidebar height to 100% if at top of page Set height of fixed sidebars with js Add sticky sidebar on wiki page Fix comment button test for slash commands Fix time tracking spec Fix issue boards sidebar alignment and sidebar toggle spec Fix failing conflicts test Fix build sidebar scrolling Refactor JS Fix pinned sidebar alignment ... | ||||
| | * | | | | Fix pagination headers in grouped environments API | Grzegorz Bizon | 2017-02-10 | 1 | -9/+14 |
| | | | | | | |||||
| | * | | | | Fix broken test and linter error | Filipa Lacerda | 2017-02-09 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Add route for environment folder and expose an API | Grzegorz Bizon | 2017-02-09 | 1 | -0/+18 |
| | | | | | | |||||
| | * | | | | Use CJS in all environments components | Filipa Lacerda | 2017-02-09 | 10 | -796/+762 |
| | | | | | | |||||
| | * | | | | Use CJS in environments service | Filipa Lacerda | 2017-02-09 | 2 | -19/+7 |
| | | | | | | |||||
| | * | | | | Use CJS for tests. | Filipa Lacerda | 2017-02-09 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Updates expected model in tests | ||||
| | * | | | | Remove store from global namespace, use CSJ instead | Filipa Lacerda | 2017-02-09 | 4 | -76/+65 |
| | | | | | | |||||
| | * | | | | Resolve 500 error | Filipa Lacerda | 2017-02-09 | 2 | -2/+1 |
| | | | | | | |||||
| | * | | | | Remove pagination from this MR | Filipa Lacerda | 2017-02-09 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | Environments folder should be underlined when on hover and on focus like a ↵ | Filipa Lacerda | 2017-02-09 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | regular link | ||||
| | * | | | | Adjustments for the new response with counters | Filipa Lacerda | 2017-02-09 | 2 | -4/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | a | ||||
| | * | | | | Add support for environment scopes in controller | Grzegorz Bizon | 2017-02-09 | 1 | -7/+12 |
| | | | | | | |||||
| | * | | | | Adjustments to receive new data schema | Filipa Lacerda | 2017-02-09 | 4 | -317/+113 |
| | | | | | | |||||
| | * | | | | Enable grouping and pagination in environmnets API | Grzegorz Bizon | 2017-02-09 | 1 | -1/+3 |
| | | | | | | |||||
* | | | | | | Merge branch '28176_merge_widget_fix' into 'master' | Sean McGivern | 2017-02-16 | 1 | -3/+6 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error in MR widget after /merge slash command Closes #28176 See merge request !9259 | ||||
| * | | | | | Fix error in MR widget after /merge slash command | Jarka Kadlecova | 2017-02-16 | 1 | -3/+6 |
| | | | | | |