summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Refactor User.find_by_any_emailYorick Peterse2017-11-071-9/+9
* Merge remote-tracking branch 'origin/master' into add-ingress-to-cluster-appl...Kamil Trzcinski2017-11-076-21/+12
|\
| * Merge branch '38464-k8s-apps' into 'master'Kamil Trzciński2017-11-0730-132/+970
| |\
| * \ Merge branch '39798-revert-gear-animation' into 'master'Clement Ho2017-11-072-18/+2
| |\ \
| | * | Revert Autodevops gear animation39798-revert-gear-animationEric Eastwood2017-11-062-18/+2
| * | | Merge branch 'multi-file-editor-table-cells-width' into 'master'Filipa Lacerda2017-11-074-3/+10
| |\ \ \
| | * | | Fixed multi-file editor table cells content width jumpingmulti-file-editor-table-cells-widthPhil Hughes2017-11-074-3/+10
* | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Kamil Trzcinski2017-11-0737-193/+373
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-0837-193/+373
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '39878-commit-pipeline-reads-wrong-key' into 'master'Tim Zallmann2017-11-071-1/+1
| | |\ \ \
| | | * | | Fix commit pipeline showing wrong status39878-commit-pipeline-reads-wrong-keyFilipa Lacerda2017-11-071-1/+1
| | * | | | Merge branch '38394-smarter-interval' into 'master'Filipa Lacerda2017-11-072-11/+27
| | |\ \ \ \
| | | * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 38394-smarter-i...Simon Knox2017-11-07135-983/+1248
| | | |\ \ \ \
| | | * | | | | update changelogSimon Knox2017-11-071-1/+1
| | | * | | | | fix line lintSimon Knox2017-11-061-1/+2
| | | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 38394-smarter-i...Simon Knox2017-11-06404-5562/+8118
| | | |\ \ \ \ \
| | | * | | | | | review feedback - throw error in smart_callback catch blockSimon Knox2017-11-021-2/+3
| | | * | | | | | update docstringSimon Knox2017-10-311-1/+1
| | | * | | | | | remove global export from SmartIntervalSimon Knox2017-10-312-4/+4
| | | * | | | | | don't re-run smart interval callback if there is already one in progressSimon Knox2017-10-242-6/+20
| | * | | | | | | Refactor issuables index actionsJarka Kadlecova2017-11-0713-101/+80
| | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge branch 'multi-file-editor-separate-commits-call' into 'master'Filipa Lacerda2017-11-0717-77/+213
| | |\ \ \ \ \ \
| | | * | | | | | fixed karma testmulti-file-editor-separate-commits-callPhil Hughes2017-11-062-2/+3
| | | * | | | | | moved key into data structurePhil Hughes2017-11-064-5/+12
| | | * | | | | | fixed specsPhil Hughes2017-11-061-1/+1
| | | * | | | | | correctly updates commit data after committing changesPhil Hughes2017-11-0610-81/+129
| | | * | | | | | only allow the call when not in collapsed viewPhil Hughes2017-11-062-2/+4
| | | * | | | | | Multi-file editor fetch log data from a different endpointPhil Hughes2017-11-0613-26/+104
| | * | | | | | | Merge branch 'fix/gb/ensure-that-job-belongs-to-stage' into 'master'Kamil Trzciński2017-11-072-1/+50
| | |\ \ \ \ \ \ \
| | | * | | | | | | Extract ensure stage service from commit status classGrzegorz Bizon2017-11-062-27/+42
| | | * | | | | | | Use existing pipeline stage if stage already existsGrzegorz Bizon2017-11-061-3/+11
| | | * | | | | | | Make sure that every job has a stage assignedGrzegorz Bizon2017-11-061-1/+27
| | * | | | | | | | Merge branch '39649-change-default-size-for-gke-cluster-creation' into 'master'Kamil Trzciński2017-11-072-2/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Change new occurrencies of n1-default-439649-change-default-size-for-gke-cluster-creationbikebilly2017-11-071-1/+1
| | | * | | | | | | | Resolve conflictsbikebilly2017-11-07117-865/+1153
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / | | | | |/| | | | | |
| | | * | | | | | | | Change default cluster size to n1-standard-2bikebilly2017-11-062-2/+2
* | | | | | | | | | | Make ingress to use install_commandKamil Trzcinski2017-11-071-0/+4
* | | | | | | | | | | Merge remote-tracking branch 'origin/38464-k8s-apps' into add-ingress-to-clus...Kamil Trzcinski2017-11-074-4/+12
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Add Helm InstallCommandAlessio Caiazza2017-11-074-4/+12
* | | | | | | | | | | Fix ingress.rbKamil Trzcinski2017-11-071-0/+2
* | | | | | | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsKamil Trzcinski2017-11-0735-127/+301
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Fix tests for initial statusKamil Trzcinski2017-11-071-0/+2
| * | | | | | | | | | Fix initial status againKamil Trzcinski2017-11-072-7/+5
| * | | | | | | | | | Do not use %i() in state machinesAlessio Caiazza2017-11-071-3/+3
| * | | | | | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Shinya Maeda2017-11-075-11/+12
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-0733-124/+296
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Resolve "Fix GKE wording"Fabio Busatto2017-11-072-2/+2
| | * | | | | | | | | | Merge branch '39791-when-reopening-an-issue-the-mattermost-notification-has-n...Rémy Coutable2017-11-071-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| | | * | | | | | | | | Fix issue reopen Mattermost / Slack message39791-when-reopening-an-issue-the-mattermost-notification-has-no-context-to-the-issueSean McGivern2017-11-061-1/+1
| | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch '37442-api-branches-id-repository-branches-is-calling-gitaly-n-1...Douwe Maan2017-11-071-3/+3
| | |\ \ \ \ \ \ \ \ \