Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | Merge branch 'master' into 38464-k8s-apps | Shinya Maeda | 2017-11-07 | 490 | -4502/+10470 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Add Clusters::Applications::Helm tests | Alessio Caiazza | 2017-11-03 | 5 | -11/+118 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Add Projects::Clusters::ApplicationsController tests | Alessio Caiazza | 2017-11-03 | 4 | -3/+76 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Fix typos | Alessio Caiazza | 2017-11-03 | 4 | -14/+10 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fix typo | Alessio Caiazza | 2017-11-03 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Schedule k8s application installation with a service | Alessio Caiazza | 2017-11-03 | 4 | -9/+42 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'refactor-clusters' into 38464-k8s-apps | Alessio Caiazza | 2017-11-03 | 17 | -358/+235 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove `Clusters::Applications::FetchInstallationStatusService` | Alessio Caiazza | 2017-11-03 | 6 | -38/+60 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Rename App to Applications | Alessio Caiazza | 2017-11-03 | 15 | -122/+126 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' into 38464-k8s-apps | Eric Eastwood | 2017-11-03 | 13 | -34/+85 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into 38464-k8s-apps | Kamil Trzcinski | 2017-11-03 | 444 | -3853/+4337 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix nitpicks | Kamil Trzcinski | 2017-11-03 | 2 | -2/+2 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Expose applications as array via API | Kamil Trzcinski | 2017-11-02 | 4 | -12/+13 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Extract ClusterWaitForAppInstallationWorker logic into a service | Alessio Caiazza | 2017-11-02 | 3 | -20/+30 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix rubocop offenses | Alessio Caiazza | 2017-11-02 | 4 | -3/+3 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | General cleanup | Alessio Caiazza | 2017-11-02 | 6 | -38/+21 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix and add applications controller | Kamil Trzcinski | 2017-11-02 | 4 | -13/+9 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Improve backend structure of data | Kamil Trzcinski | 2017-11-02 | 21 | -77/+129 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'refactor-clusters' into 38464-k8s-apps | Kamil Trzcinski | 2017-11-02 | 1207 | -13334/+31552 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Revert "Add helm CLI wrapper" | Alessio Caiazza | 2017-11-02 | 2 | -127/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6d462cea77508e407995c58b0ae581edefa74d22. | |||||
| * | | | | | | | | | | | | Install k8s application with helm running inside the cluster | Alessio Caiazza | 2017-11-02 | 18 | -1/+366 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | WIP: mock cluster apps status API | Alessio Caiazza | 2017-10-31 | 5 | -4/+51 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add helm CLI wrapper | Alessio Caiazza | 2017-10-17 | 2 | -0/+127 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch '39798-revert-gear-animation' into 'master' | Clement Ho | 2017-11-07 | 3 | -23/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert Auto DevOps gear animation Closes #39798 See merge request gitlab-org/gitlab-ce!15232 | |||||
| * | | | | | | | | | | | | | Revert Autodevops gear animation39798-revert-gear-animation | Eric Eastwood | 2017-11-06 | 3 | -23/+2 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39798 | |||||
* | | | | | | | | | | | | | Merge branch 'multi-file-editor-table-cells-width' into 'master' | Filipa Lacerda | 2017-11-07 | 4 | -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-width | Phil Hughes | 2017-11-07 | 4 | -3/+10 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch '39903-restore-backup-warning' into 'master' | Douwe Maan | 2017-11-07 | 1 | -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-warning | digitalMoksha | 2017-11-07 | 1 | -17/+22 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Make warning message more explicit | digitalMoksha | 2017-11-07 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch '39878-commit-pipeline-reads-wrong-key' into 'master' | Tim Zallmann | 2017-11-07 | 3 | -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-key | Filipa Lacerda | 2017-11-07 | 3 | -1/+13 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch '38394-smarter-interval' into 'master' | Filipa Lacerda | 2017-11-07 | 5 | -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-interval | Simon Knox | 2017-11-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Simon Knox | 2017-11-07 | 337 | -4376/+11269 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38394-smarter-interval | |||||
| * | | | | | | | | | | | | | | | update changelog | Simon Knox | 2017-11-07 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | fix line lint | Simon Knox | 2017-11-06 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Simon Knox | 2017-11-06 | 1674 | -17017/+34785 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38394-smarter-interval | |||||
| * | | | | | | | | | | | | | | | | review feedback - throw error in smart_callback catch block | Simon Knox | 2017-11-02 | 2 | -8/+12 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | update docstring | Simon Knox | 2017-10-31 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | remove global export from SmartInterval | Simon Knox | 2017-10-31 | 4 | -136/+138 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | add changelog and spec | Simon Knox | 2017-10-27 | 2 | -0/+17 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | don't re-run smart interval callback if there is already one in progress | Simon Knox | 2017-10-24 | 3 | -7/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because some things take time | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'fix/import-export-arguments' into 'master' | Douwe Maan | 2017-11-07 | 4 | -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-arguments | James Lopez | 2017-11-07 | 2 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | added changelog | James Lopez | 2017-11-07 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Fix arguments error on Import/Export fetch_ref method | James Lopez | 2017-11-07 | 3 | -2/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added unit test and updated integration spec to test for this as well. | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'issue-ordering-docs' into 'master' | Sean McGivern | 2017-11-07 | 1 | -6/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue ordering docs Closes #39712 See merge request gitlab-org/gitlab-ce!15243 | |||||
| * | | | | | | | | | | | | | | | | | | issue ordering docs | Victor Wu | 2017-11-07 | 1 | -6/+20 | |
|/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jk-backport-issuables-refactor' into 'master' | Sean McGivern | 2017-11-07 | 14 | -155/+80 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor issuables index actions See merge request gitlab-org/gitlab-ce!15242 |