summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add frozen_string_literal to new filesgroup_k8s_clusterThong Kuah2018-10-082-0/+4
* WIP: Show group cluster on project cluster listThong Kuah2018-10-082-2/+5
* One way a project can deploy to a group cluster.Thong Kuah2018-10-083-0/+17
* Install ingress into group clusterThong Kuah2018-10-081-1/+1
* Allow group cluster to use #kubeclient too.Thong Kuah2018-10-081-1/+1
* DELETE group-level clusterThong Kuah2018-10-082-0/+29
* Hack in :admin_cluster for group-level clusterThong Kuah2018-10-084-2/+30
* POST clusters/application to create cluster appsThong Kuah2018-10-084-1/+153
* Remove inheritance as we don't need projectThong Kuah2018-10-083-4/+9
* GET status for each cluster applicationThong Kuah2018-10-084-1/+36
* GET show clusterThong Kuah2018-10-088-0/+178
* Create group clustersThong Kuah2018-10-087-1/+258
* Ability to link clusters to groupsThong Kuah2018-10-088-0/+64
* Groups > ClustersController#index empty stateThong Kuah2018-10-087-0/+78
* Merge branch 'bw-fix-checking-disabled-services' into 'master'51761-create-new-project-auto-populate-project-slug-string-to-project-name-if-name-is-empty34758-split-create-gcp-controllerStan Hu2018-10-062-11/+31
|\
| * Check disabled_services when finding a serviceBrett Walker2018-10-062-11/+31
* | Merge branch '52242-ui-ux-bug-in-change-group-path' into 'master'Douglas Barbosa Alexandre2018-10-063-2/+23
|\ \
| * | Fix invalid parent path on group settings pageDmitriy Zaporozhets2018-10-063-2/+23
|/ /
* | Merge branch 'ce-1984-frontend-for-batch-comments' into 'master'Tim Zallmann2018-10-0615-50/+123
|\ \ | |/ |/|
| * Backport CE changes for: [Frontend only] Batch comments on merge requestsAndré Luís2018-10-0615-50/+123
|/
* Merge branch 'add-button-to-insert-table-in-markdown' into 'master'Clement Ho2018-10-065-2/+40
|\
| * Add button to insert table in markdown editorGeorge Tsiolis2018-10-065-2/+40
|/
* Merge branch 'gitaly-0.125.0' into 'master'Stan Hu2018-10-061-1/+1
|\
| * Update GITALY_SERVER_VERSIONJames Lopez2018-10-061-1/+1
* | Merge branch 'backport-ce-to-ee-merge' into 'master'Stan Hu2018-10-062-6/+7
|\ \ | |/ |/|
| * Fix CE to EE merge (backport)Kamil Trzciński2018-10-052-6/+7
* | Merge branch 'update-operations-metrics-empty-state' into 'master'Mike Greiling2018-10-062-9/+14
|\ \
| * | Update operations metrics empty stateGeorge Tsiolis2018-10-062-9/+14
|/ /
* | Merge branch 'osw-fix-lfs-images-not-rendering' into 'master'Douglas Barbosa Alexandre2018-10-0510-7/+56
|\ \
| * | Fix LFS uploaded images not being renderedOswaldo Ferreira2018-10-0510-7/+56
|/ /
* | Merge branch 'ee-7126-admin-projects-geo-status' into 'master'Douglas Barbosa Alexandre2018-10-052-0/+13
|\ \
| * | Prepare admin/projects/show view to allow EE specific featureGabriel Mazetto2018-10-052-0/+13
* | | Merge branch 'autodevops-timed-incremental-rollout' into 'master'Kamil Trzciński2018-10-058-68/+162
|\ \ \ | |/ / |/| |
| * | Add timed incremental rollout to Auto DevOpsAlessio Caiazza2018-10-058-68/+162
|/ /
* | Merge branch 'fix-flacky-test-jobs-spec' into 'master'Kamil Trzciński2018-10-051-4/+0
|\ \
| * | Fix time dependent jobs specAlessio Caiazza2018-10-051-4/+0
* | | Merge branch '43109-ci_environments_status-json-executes-more-than-100-querie...Sean McGivern2018-10-054-29/+52
|\ \ \
| * | | Update spec comment to point to correct issueBrett Walker2018-10-051-1/+1
| * | | Don't build project services unneccesarilyBrett Walker2018-10-044-29/+52
* | | | Merge branch 'docs/variables-doc' into 'master'Achilleas Pipinellis2018-10-051-9/+11
|\ \ \ \
| * | | | Fix documentation for variablesEvan Read2018-10-051-9/+11
|/ / / /
* | | | Merge branch '7453_document_security_and_licence_management_features_permissi...Achilleas Pipinellis2018-10-051-1/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Document Security and Licence Management features permissionsGilbert Roulot2018-10-051-1/+8
|/ / /
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqBob Van Landuyt2018-10-0516-39/+194
|\ \ \
| * \ \ Merge branch 'security-bw-confidential-titles-through-markdown-api' into 'mas...Bob Van Landuyt2018-10-055-5/+62
| |\ \ \
| | * | | post_process markdown redered by APIBrett Walker2018-09-295-5/+62
| * | | | Merge branch 'security-fix-leaking-private-project-namespace' into 'master'Bob Van Landuyt2018-10-056-33/+80
| |\ \ \ \
| | * | | | Filter system notes with public and private cross referencesBrett Walker2018-10-026-33/+80
| * | | | | Merge branch 'security-osw-user-info-leak-discussions' into 'master'Bob Van Landuyt2018-10-054-1/+34
| |\ \ \ \ \
| | * | | | | Add changelogOswaldo Ferreira2018-10-011-0/+5
View Lorry Controller Status