summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed bug and extracted codefj-47229-fix-logo-lfs-trackedFrancisco Javier López2018-07-313-36/+38
* Update CHANGELOG.md for 11.1.4GitLab Release Tools Bot2018-07-301-0/+4
* Merge branch 'sh-fix-health-docs' into 'master'Robert Speicher2018-07-301-1/+1
|\
| * Fix typo in health check documentationStan Hu2018-07-301-1/+1
* | Merge branch 'extract-ee-specific-lines-from-issuable-finders' into 'master'Robert Speicher2018-07-301-1/+1
|\ \ | |/ |/|
| * Extract EE-specific lines from issuable findersSean McGivern2018-07-301-1/+1
* | Merge branch 'update-efs-documentation' into 'master'Sid Sijbrandij2018-07-302-21/+7
|\ \
| * | Clean up AWS EFS documentationJoshua Lambert2018-07-302-21/+7
* | | Merge branch 'patch-24' into 'master'Nick Thomas2018-07-301-1/+1
|\ \ \
| * | | Fix typos in CreateGpgSignatureWorker specPeter Leitzen2018-07-301-1/+1
|/ / /
* | | Merge branch 'sh-simplify-liveness-check' into 'master'Robert Speicher2018-07-306-2/+122
|\ \ \ | |/ / |/| |
| * | Use /-/health instead of breaking /-/livenessStan Hu2018-07-288-21/+101
| * | Simplify /-/liveness check to avoid connecting to the databaseStan Hu2018-07-288-77/+117
* | | Merge branch 'sh-fix-admin-jobs-controller-timing-out' into 'master'Robert Speicher2018-07-302-1/+6
|\ \ \
| * | | Fix /admin/jobs failing to load due to statement timeoutStan Hu2018-07-302-1/+6
* | | | Merge branch '32821-better-error-message-add-invalid-user-to-project' into 'm...Rémy Coutable2018-07-303-1/+17
|\ \ \ \
| * | | | Improve error message when adding invalid user to a projectJacopo2018-07-303-1/+17
| | |/ / | |/| |
* | | | Merge branch 'sh-make-unicorn-work-rbtrace' into 'master'Rémy Coutable2018-07-304-4/+12
|\ \ \ \ | |_|/ / |/| | |
| * | | Move rbtrace initialization into SidekiqStan Hu2018-07-302-5/+2
| * | | Make rbtrace work under unicornStan Hu2018-07-303-2/+13
* | | | Merge branch 'fj-37736-improve-performance-post-receive-create-gpg-siganture-...Nick Thomas2018-07-307-23/+76
|\ \ \ \
| * | | | Create GPG commit signature in bulkFrancisco Javier López2018-07-307-23/+76
|/ / / /
* | | | Merge branch 'fix-cycle-analytics-link-doc' into 'master'Rémy Coutable2018-07-301-1/+2
|\ \ \ \
| * | | | Fix link to Cycle Analytics in helpFrank Sauerburger2018-07-291-1/+2
| | |/ / | |/| |
* | | | Merge branch 'rails5-gpg-permit-concurrent' into 'master'Grzegorz Bizon2018-07-302-2/+15
|\ \ \ \
| * | | | Permit concurrent loads in gpg keychain mutexJasper Maes2018-07-292-2/+15
| |/ / /
* | | | Merge branch 'workhorse-5-1-0' into 'master'Rémy Coutable2018-07-301-1/+1
|\ \ \ \
| * | | | Update GitLab Workhorse to v5.1.0nick.thomas/gitlab-ce-workhorse-5-1-0Nick Thomas2018-07-301-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'sh-bump-prometheus-client-mmap-gem' into 'master'Rémy Coutable2018-07-303-5/+5
|\ \ \ \
| * | | | Bump prometheus-client-mmap to 0.9.4Stan Hu2018-07-283-5/+5
| | |/ / | |/| |
* | | | Merge branch '48098-mutual-auth-cluster-applications' into 'master'Dmitriy Zaporozhets2018-07-3034-178/+534
|\ \ \ \
| * | | | Minor style improvements for Helm codeDylan Griffith2018-07-305-4/+16
| * | | | Add changelog for helm tiller mutual auth !20801Dylan Griffith2018-07-301-0/+6
| * | | | Use guard clause in Helm::InstallCommandDylan Griffith2018-07-301-6/+6
| * | | | Expand ca -> certificate_authority in Helm::CertificateDylan Griffith2018-07-301-4/+4
| * | | | Combine attr_reader in InstallCommand to one lineDylan Griffith2018-07-301-2/+1
| * | | | Minor refactoring of InitCommand and InstallCommandDylan Griffith2018-07-302-10/+12
| * | | | Minor refactoring of Helm and ApplicationDataDylan Griffith2018-07-303-32/+49
| * | | | Use anonymous class in base_command_specDylan Griffith2018-07-301-12/+18
| * | | | Reduce duplication in code in Gitlab::Kubernetes::Helm::CertificateDylan Griffith2018-07-301-30/+23
| * | | | Ensure CA + Tiller cert never expire and Helm client cert expires quicklyDylan Griffith2018-07-308-6/+51
| * | | | Install cluster applications in parallel in auto devops QADylan Griffith2018-07-301-2/+3
| * | | | Fix race condition in auto devops QA spec: ensure we wait for Install button ...Dylan Griffith2018-07-302-1/+3
| * | | | Fix race condition in spec/features/projects/clusters/applications_spec.rbDylan Griffith2018-07-301-2/+12
| * | | | Get mutual SSL working with helm tillerDylan Griffith2018-07-3019-59/+328
| * | | | Refactor Cluster Application classes to pass through a has of config filesDylan Griffith2018-07-2822-128/+122
| |/ / /
* | | | Merge branch '49701-sorting-by-name-on-milestones-page-error' into 'master'Sean McGivern2018-07-303-0/+29
|\ \ \ \
| * | | | Add CHANGELOGDouglas Barbosa Alexandre2018-07-301-0/+5
| * | | | Fix ordering by name on milestones pageDouglas Barbosa Alexandre2018-07-302-0/+24
|/ / / /
* | | | Merge branch 'ce-backport-3772-total-weight' into 'master'Phil Hughes2018-07-3012-46/+113
|\ \ \ \