Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'e8f4bfd114f214e17f8777fdedc9aef79ee2552c' into 11-4-stable-prep...11-4-stable-prepare-rc2 | Jan Provaznik | 2018-10-08 | 819 | -13311/+51739 |
|\ | |||||
| * | Merge branch 'update-templates-11-4' into 'master' | Kamil Trzciński | 2018-10-08 | 4 | -3/+14 |
| |\ | |||||
| | * | Update templates for 11.4 | Jan Provaznik | 2018-10-08 | 4 | -3/+14 |
| * | | Merge branch 'increase-event-retention-prune-old-events-worker' into 'master' | Douwe Maan | 2018-10-08 | 4 | -12/+22 |
| |\ \ | |||||
| | * | | Updated docs to reflect new 2 year period | Jeremy Watson | 2018-10-06 | 1 | -1/+1 |
| | * | | Updated code comments for clarity based on 2 years | Jeremy Watson | 2018-10-06 | 1 | -3/+2 |
| | * | | Added changelog | Jeremy Watson | 2018-10-06 | 1 | -0/+5 |
| | * | | Added new test and updated all event ids | Jeremy Watson | 2018-10-05 | 1 | -3/+8 |
| | * | | Renamed test events | Jeremy Watson | 2018-10-05 | 1 | -2/+3 |
| | * | | Updated existing spec for new 2 year timeframe | Jeremy Watson | 2018-10-05 | 1 | -3/+3 |
| | * | | prune older than 2 years instead of 12 months | Jeremy Watson | 2018-10-05 | 1 | -1/+1 |
| * | | | Merge branch 'sh-remove-duplicate-logging' into 'master' | Douwe Maan | 2018-10-08 | 1 | -1/+0 |
| |\ \ \ | |||||
| | * | | | Remove duplicate Sentry logging for GRPC messages | Stan Hu | 2018-10-07 | 1 | -1/+0 |
| | | |/ | | |/| | |||||
| * | | | Merge branch 'update-licenses-11-4' into 'master' | Sean McGivern | 2018-10-08 | 1 | -185/+222 |
| |\ \ \ | |||||
| | * | | | Updated licenses for 11.4 | Jan Provaznik | 2018-10-08 | 1 | -185/+222 |
| | |/ / | |||||
| * | | | Merge branch 'backport-ce-to-ee-spec-fix' into 'master' | Rémy Coutable | 2018-10-08 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Fix issues controller N+1 failure | Sean McGivern | 2018-10-05 | 1 | -1/+1 |
| * | | | | Merge branch 'patch-29' into 'master' | Kamil Trzciński | 2018-10-08 | 1 | -3/+6 |
| |\ \ \ \ | |||||
| | * | | | | Updates Laravel.gitlab-ci.yml template | Paul Giberson | 2018-10-06 | 1 | -3/+6 |
| * | | | | | Merge branch 'zj-render-log-artifacts' into 'master' | Kamil Trzciński | 2018-10-08 | 2 | -1/+6 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Render log artifact files in GitLab | Zeger-Jan van de Weg | 2018-10-08 | 2 | -1/+6 |
| |/ / / / | |||||
| * | | | | 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-controller | Stan Hu | 2018-10-06 | 2 | -11/+31 |
| |\ \ \ \ | |||||
| | * | | | | Check disabled_services when finding a service | Brett Walker | 2018-10-06 | 2 | -11/+31 |
| * | | | | | Merge branch '52242-ui-ux-bug-in-change-group-path' into 'master' | Douglas Barbosa Alexandre | 2018-10-06 | 3 | -2/+23 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix invalid parent path on group settings page | Dmitriy Zaporozhets | 2018-10-06 | 3 | -2/+23 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'ce-1984-frontend-for-batch-comments' into 'master' | Tim Zallmann | 2018-10-06 | 15 | -50/+123 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Backport CE changes for: [Frontend only] Batch comments on merge requests | André Luís | 2018-10-06 | 15 | -50/+123 |
| |/ / / / | |||||
| * | | | | Merge branch 'add-button-to-insert-table-in-markdown' into 'master' | Clement Ho | 2018-10-06 | 5 | -2/+40 |
| |\ \ \ \ | |||||
| | * | | | | Add button to insert table in markdown editor | George Tsiolis | 2018-10-06 | 5 | -2/+40 |
| |/ / / / | |||||
| * | | | | Merge branch 'gitaly-0.125.0' into 'master' | Stan Hu | 2018-10-06 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Update GITALY_SERVER_VERSION | James Lopez | 2018-10-06 | 1 | -1/+1 |
| | |/ / / | |||||
| * | | | | Merge branch 'backport-ce-to-ee-merge' into 'master' | Stan Hu | 2018-10-06 | 2 | -6/+7 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Fix CE to EE merge (backport) | Kamil Trzciński | 2018-10-05 | 2 | -6/+7 |
| * | | | | Merge branch 'update-operations-metrics-empty-state' into 'master' | Mike Greiling | 2018-10-06 | 2 | -9/+14 |
| |\ \ \ \ | |||||
| | * | | | | Update operations metrics empty state | George Tsiolis | 2018-10-06 | 2 | -9/+14 |
| |/ / / / | |||||
| * | | | | Merge branch 'osw-fix-lfs-images-not-rendering' into 'master' | Douglas Barbosa Alexandre | 2018-10-05 | 10 | -7/+56 |
| |\ \ \ \ | |||||
| | * | | | | Fix LFS uploaded images not being rendered | Oswaldo Ferreira | 2018-10-05 | 10 | -7/+56 |
| |/ / / / | |||||
| * | | | | Merge branch 'ee-7126-admin-projects-geo-status' into 'master' | Douglas Barbosa Alexandre | 2018-10-05 | 2 | -0/+13 |
| |\ \ \ \ | |||||
| | * | | | | Prepare admin/projects/show view to allow EE specific feature | Gabriel Mazetto | 2018-10-05 | 2 | -0/+13 |
| * | | | | | Merge branch 'autodevops-timed-incremental-rollout' into 'master' | Kamil Trzciński | 2018-10-05 | 8 | -68/+162 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Add timed incremental rollout to Auto DevOps | Alessio Caiazza | 2018-10-05 | 8 | -68/+162 |
| |/ / / / | |||||
| * | | | | Merge branch 'fix-flacky-test-jobs-spec' into 'master' | Kamil Trzciński | 2018-10-05 | 1 | -4/+0 |
| |\ \ \ \ | |||||
| | * | | | | Fix time dependent jobs spec | Alessio Caiazza | 2018-10-05 | 1 | -4/+0 |
| * | | | | | Merge branch '43109-ci_environments_status-json-executes-more-than-100-querie... | Sean McGivern | 2018-10-05 | 4 | -29/+52 |
| |\ \ \ \ \ | |||||
| | * | | | | | Update spec comment to point to correct issue | Brett Walker | 2018-10-05 | 1 | -1/+1 |
| | * | | | | | Don't build project services unneccesarily | Brett Walker | 2018-10-04 | 4 | -29/+52 |
| * | | | | | | Merge branch 'docs/variables-doc' into 'master' | Achilleas Pipinellis | 2018-10-05 | 1 | -9/+11 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix documentation for variables | Evan Read | 2018-10-05 | 1 | -9/+11 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch '7453_document_security_and_licence_management_features_permissi... | Achilleas Pipinellis | 2018-10-05 | 1 | -1/+8 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Document Security and Licence Management features permissions | Gilbert Roulot | 2018-10-05 | 1 | -1/+8 |
| |/ / / / / |