summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-07490-4502/+10470
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Add Clusters::Applications::Helm testsAlessio Caiazza2017-11-035-11/+118
| | | | | | | | | |
| * | | | | | | | | Add Projects::Clusters::ApplicationsController testsAlessio Caiazza2017-11-034-3/+76
| | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Fix typosAlessio Caiazza2017-11-034-14/+10
| | | | | | | | |
| * | | | | | | | Fix typoAlessio Caiazza2017-11-031-1/+1
| | | | | | | | |
| * | | | | | | | Schedule k8s application installation with a serviceAlessio Caiazza2017-11-034-9/+42
| | | | | | | | |
| * | | | | | | | Merge branch 'refactor-clusters' into 38464-k8s-appsAlessio Caiazza2017-11-0317-358/+235
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Remove `Clusters::Applications::FetchInstallationStatusService`Alessio Caiazza2017-11-036-38/+60
| | | | | | | | | |
| * | | | | | | | | Rename App to ApplicationsAlessio Caiazza2017-11-0315-122/+126
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into 38464-k8s-appsEric Eastwood2017-11-0313-34/+85
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 38464-k8s-appsKamil Trzcinski2017-11-03444-3853/+4337
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix nitpicksKamil Trzcinski2017-11-032-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Expose applications as array via APIKamil Trzcinski2017-11-024-12/+13
| | | | | | | | | | | |
| * | | | | | | | | | | Extract ClusterWaitForAppInstallationWorker logic into a serviceAlessio Caiazza2017-11-023-20/+30
| | | | | | | | | | | |
| * | | | | | | | | | | Fix rubocop offensesAlessio Caiazza2017-11-024-3/+3
| | | | | | | | | | | |
| * | | | | | | | | | | General cleanupAlessio Caiazza2017-11-026-38/+21
| | | | | | | | | | | |
| * | | | | | | | | | | Fix and add applications controllerKamil Trzcinski2017-11-024-13/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Improve backend structure of dataKamil Trzcinski2017-11-0221-77/+129
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'refactor-clusters' into 38464-k8s-appsKamil Trzcinski2017-11-021207-13334/+31552
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Revert "Add helm CLI wrapper"Alessio Caiazza2017-11-022-127/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6d462cea77508e407995c58b0ae581edefa74d22.
| * | | | | | | | | | | | Install k8s application with helm running inside the clusterAlessio Caiazza2017-11-0218-1/+366
| | | | | | | | | | | | |
| * | | | | | | | | | | | WIP: mock cluster apps status APIAlessio Caiazza2017-10-315-4/+51
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add helm CLI wrapperAlessio Caiazza2017-10-172-0/+127
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '39798-revert-gear-animation' into 'master'Clement Ho2017-11-073-23/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert Auto DevOps gear animation Closes #39798 See merge request gitlab-org/gitlab-ce!15232
| * | | | | | | | | | | | | Revert Autodevops gear animation39798-revert-gear-animationEric Eastwood2017-11-063-23/+2
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39798
* | | | | | | | | | | | | Merge branch 'multi-file-editor-table-cells-width' into 'master'Filipa Lacerda2017-11-074-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed multi-file editor table cells content width jumping See merge request gitlab-org/gitlab-ce!15245
| * | | | | | | | | | | | Fixed multi-file editor table cells content width jumpingmulti-file-editor-table-cells-widthPhil Hughes2017-11-074-3/+10
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '39903-restore-backup-warning' into 'master'Douwe Maan2017-11-071-17/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make restoring backup database table warning more explicit Closes #39903 See merge request gitlab-org/gitlab-ce!15246
| * | | | | | | | | | | | | show better message when deciding not to continue39903-restore-backup-warningdigitalMoksha2017-11-071-17/+22
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Make warning message more explicitdigitalMoksha2017-11-071-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch '39878-commit-pipeline-reads-wrong-key' into 'master'Tim Zallmann2017-11-073-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix commit pipeline showing wrong status Closes #39878 See merge request gitlab-org/gitlab-ce!15238
| * | | | | | | | | | | | | Fix commit pipeline showing wrong status39878-commit-pipeline-reads-wrong-keyFilipa Lacerda2017-11-073-1/+13
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '38394-smarter-interval' into 'master'Filipa Lacerda2017-11-075-133/+171
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't re-run smart interval callback if there is already one in progress Closes #38394 See merge request gitlab-org/gitlab-ce!15032
| * | | | | | | | | | | | | | fix MR ref in changelog38394-smarter-intervalSimon Knox2017-11-081-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-11-07337-4376/+11269
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38394-smarter-interval
| * | | | | | | | | | | | | | | update changelogSimon Knox2017-11-072-3/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix line lintSimon Knox2017-11-061-1/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-11-061674-17017/+34785
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38394-smarter-interval
| * | | | | | | | | | | | | | | | review feedback - throw error in smart_callback catch blockSimon Knox2017-11-022-8/+12
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | update docstringSimon Knox2017-10-311-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | remove global export from SmartIntervalSimon Knox2017-10-314-136/+138
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | add changelog and specSimon Knox2017-10-272-0/+17
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | don't re-run smart interval callback if there is already one in progressSimon Knox2017-10-243-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because some things take time
* | | | | | | | | | | | | | | | | Merge branch 'fix/import-export-arguments' into 'master'Douwe Maan2017-11-074-2/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix arguments error on Import/Export fetch_ref method Closes #39541 See merge request gitlab-org/gitlab-ce!15241
| * | | | | | | | | | | | | | | | | fix specsfix/import-export-argumentsJames Lopez2017-11-072-4/+4
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | added changelogJames Lopez2017-11-071-0/+5
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix arguments error on Import/Export fetch_ref methodJames Lopez2017-11-073-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added unit test and updated integration spec to test for this as well.
* | | | | | | | | | | | | | | | | | Merge branch 'issue-ordering-docs' into 'master'Sean McGivern2017-11-071-6/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue ordering docs Closes #39712 See merge request gitlab-org/gitlab-ce!15243
| * | | | | | | | | | | | | | | | | | issue ordering docsVictor Wu2017-11-071-6/+20
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'jk-backport-issuables-refactor' into 'master'Sean McGivern2017-11-0714-155/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor issuables index actions See merge request gitlab-org/gitlab-ce!15242