summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'require-pipeline-when-enabling-only-allow-merge-if-pipeline-suc...Grzegorz Bizon2019-06-251-2/+2
|\
| * Use actual_head_pipeline to enforce presenceFabio Pitino2019-06-251-2/+2
| * Require pipeline if "Pipeline must succeed" is setrequire-pipeline-when-enabling-only-allow-merge-if-pipeline-succeedsFabio Pitino2019-06-251-1/+1
* | Merge branch 'update-gitlab-runner-helm-chart-to-0-6-0' into 'master'Kamil Trzciński2019-06-251-1/+1
|\ \ | |/ |/|
| * Update GitLab Runner Helm Chart to 0.6.0update-gitlab-runner-helm-chart-to-0-6-0Tomasz Maczukin2019-06-241-1/+1
* | Rename to time_tracking_limit_to_hours30355-use-hours-only-for-time-trackingHeinrich Lee Yu2019-06-251-1/+1
* | Limit time tracking values to hoursJon Kolb2019-06-251-0/+1
* | Merge branch 'refactor_deployment_cluster' into 'master'Stan Hu2019-06-241-6/+3
|\ \
| * | Rename method to not clash with #clusterrefactor_deployment_clusterThong Kuah2019-06-241-1/+2
| * | Move innards of cluster method to environmentThong Kuah2019-06-241-5/+1
* | | Renew Let's Encrypt certificatesVladimir Shushlin2019-06-241-0/+10
* | | Rename Todos.with_api_entity_associations to with_entity_associationssh-optimize-todos-controllerStan Hu2019-06-241-1/+1
| |/ |/|
* | Merge branch 'fix-labels-in-hooks' into 'master'Ash McKenzie2019-06-241-0/+4
|\ \
| * | Added labels_hook_attrs methodfix-labels-in-hooksJan Provaznik2019-06-241-0/+4
* | | Merge branch 'fix-pipeline-schedule-edge-case' into 'master'Lin Jen-Shin2019-06-241-6/+17
|\ \ \
| * | | Fix pipeline schedule edge casefix-pipeline-schedule-edge-caseShinya Maeda2019-06-241-6/+17
* | | | Merge branch 'sync-merge-ref-upon-mergeability-check' into 'master'Douwe Maan2019-06-241-21/+15
|\ \ \ \
| * | | | Avoid touching the MR status if MR is not openedOswaldo Ferreira2019-06-211-4/+0
| * | | | Automatically update MR merge-ref along merge statusOswaldo Ferreira2019-06-201-21/+19
* | | | | Merge branch '17690-Protect-TeamCity-builds-for-triggering-when-a-branch-is-d...Thong Kuah2019-06-243-43/+94
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Extract common validations from ci servicesRaphael Tweitmann2019-06-213-48/+57
| * | | | Skip TeamCity on branch delete and add MR triggerNikolay Novikov2019-06-211-24/+66
| | |_|/ | |/| |
* | | | Merge branch '60617-enable-project-cluster-jit' into 'master'Thong Kuah2019-06-241-9/+0
|\ \ \ \
| * | | | Enable project-level JIT resource creation60617-enable-project-cluster-jitTiger2019-06-181-9/+0
* | | | | Merge branch 'sh-promote-remove-migration' into 'master'Thong Kuah2019-06-241-0/+2
|\ \ \ \ \
| * | | | | Re-add ignore_column for import columnsStan Hu2019-06-231-0/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'reduce_prometheus_adapter' into 'master'Ash McKenzie2019-06-242-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Run least expensive method first - has_metrics?reduce_prometheus_adapterThong Kuah2019-06-201-1/+1
| * | | | Run least expensive method first - #has_terminals?Thong Kuah2019-06-201-1/+1
| * | | | Run least expensive method firstThong Kuah2019-06-201-1/+1
| | |_|/ | |/| |
* | | | Don't show private keys for letsencrypt certsVladimir Shushlin2019-06-211-0/+30
* | | | Merge branch 'bug/63162-duplicate_path_in_links' into 'master'Sean McGivern2019-06-211-1/+1
|\ \ \ \
| * | | | Do not rewrite relative links for system notesbug/63162-duplicate_path_in_linksMario de la Ossa2019-06-201-1/+1
| |/ / /
* | | | Merge branch 'remove-kubernetes-service-deployment-platform' into 'master'Thong Kuah2019-06-212-45/+3
|\ \ \ \
| * | | | Update KubernetesService deprecation warningremove-kubernetes-service-deployment-platformTiger2019-06-211-7/+2
| * | | | Remove Kubernetes service from deployment platformTiger2019-06-211-38/+1
| | |_|/ | |/| |
* | | | Remove project-level cluster credential fallbackTiger Watson2019-06-211-13/+0
|/ / /
* | | Remove import columns from projects tablesh-remove-import-columns-from-projectsStan Hu2019-06-191-2/+0
* | | Knative version bump 0.5 -> 0.6Chris Baumbauer2019-06-191-1/+1
|/ /
* | #57815 Password authentication disabled for UltraAuth usersKartikey Tanna2019-06-181-2/+10
|/
* Merge branch '60617-allow-switching-from-gitlab-managed-to-unmanaged-clusters...Thong Kuah2019-06-181-2/+11
|\
| * Allow switching clusters between managed/unmanagedTiger2019-06-181-2/+11
* | Make KubernetesService readonlyJames Fargher2019-06-183-57/+47
* | Merge branch 'migrate_k8s_service_integration' into 'master'Thong Kuah2019-06-171-1/+1
|\ \ | |/ |/|
| * Allow a user defined namespace on non-gitlab managed clustersJames Fargher2019-05-301-1/+1
* | Merge branch '63079-exclude-k8s-namespaces-with-no-service-account-token' int...Thong Kuah2019-06-171-3/+22
|\ \
| * | Don't use Kubernetes namespaces with no token63079-exclude-k8s-namespaces-with-no-service-account-tokenTiger2019-06-171-3/+22
* | | Merge branch '56737-commits-and-mr-events-on-jira-api' into 'master'Stan Hu2019-06-171-2/+2
|\ \ \
| * | | 56737 Expose currently supported events properly on services APIZsolt Kovari2019-06-161-2/+2
* | | | Merge branch '58886-issue-tracker-fields' into 'master'Sean McGivern2019-06-174-0/+66
|\ \ \ \
View Lorry Controller Status