summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'docs/edit-zoom-call-link-content' into 'master'12-0-stable-prepare-rc22Achilleas Pipinellis2019-06-201-2/+9
* Merge branch 'docs/existing-knative-edit' into 'master'Achilleas Pipinellis2019-06-201-4/+14
* Merge branch '12-0-stable-prepare-rc22' into '12-0-stable'Robert Speicher2019-06-1919-54/+136
|\
| * Merge branch 'link_zoom_call_issue-docs' into 'master'Achilleas Pipinellis2019-06-192-0/+6
| * Merge branch '63417-add-missing-class' into 'master'Kamil Trzciński2019-06-193-3/+8
| * Merge branch 'docs/12-0-upgrade' into 'master'Achilleas Pipinellis2019-06-191-0/+21
| * Merge branch '11449-qa-fixes-for-sast-ds-docs' into 'master'Achilleas Pipinellis2019-06-192-8/+7
| * Merge branch 'ac-usage-quotas-docs' into 'master'Achilleas Pipinellis2019-06-194-4/+10
| * Merge branch 'zj-feature-flag-default-on-catfile-cache' into 'master'Douwe Maan2019-06-197-39/+84
|/
* Merge branch '12-1-auto-deploy-0010836' into 12-0-stableRobert Speicher2019-06-1915-13/+163
|\
| * Merge branch 'sh-pipeline-typo-docs' into 'master'Marcia Ramos2019-06-191-1/+2
| * Merge branch 'revert-concurrent-pipeline-schedule-creation' into 'master'Kamil Trzciński2019-06-183-1/+49
| * Merge branch '59023-fix-web-ide-creating-branches-off-new-commits' into 'master'Phil Hughes2019-06-187-10/+92
| * Merge branch 'backport-report_approver-migration-to-ce' into 'master'Yorick Peterse2019-06-182-0/+14
| * Merge branch 'gitaly-version-v1.47.0' into 'master'Yorick Peterse2019-06-182-1/+6
| * Restore Jira tables in db/schema.rbYorick Peterse2019-06-171-0/+20
| * Merge branch 'merge-schema-backport-to-auto-deploy' into '12-1-auto-deploy-00...Yorick Peterse2019-06-17108-3455/+4696
| |\
| | * Run CI migrations since 11.11.0Yorick Peterse2019-06-171-1/+1
| | * Backport the EE schema and migrations to CEYorick Peterse2019-06-17105-3449/+4659
| | * Allow custom names for concurrent foreign keysYorick Peterse2019-06-172-5/+36
| |/
| * Merge branch 'master-i18n' into 'master'Bob Van Landuyt2019-06-1745-71/+1556
* | Merge branch 'config-application-differences' into 'master'Lin Jen-Shin2019-06-181-0/+30
|\ \
| * | Backport EE changes to config/application.rbconfig-application-differencesYorick Peterse2019-06-171-0/+30
* | | Merge branch 'ashmckenzie/add-created-at-index-to-events' into 'master'Thong Kuah2019-06-182-0/+27
|\ \ \
| * | | Add index to events and audit_events tablesashmckenzie/add-created-at-index-to-eventsAsh McKenzie2019-06-182-0/+27
* | | | Merge branch 'bw-update-graphql-docs' into 'master'Evan Read2019-06-181-1/+1
|\ \ \ \
| * | | | Mention that epics are supported in GraphqlQLbw-update-graphql-docsBrett Walker2019-06-171-1/+1
* | | | | Merge branch 'docs/add-note-git-clone-path' into 'master'Evan Read2019-06-181-0/+18
|\ \ \ \ \
| * | | | | Add note about nested variables for GIT_CLONE_PATHSteve Azzopardi2019-06-181-0/+18
|/ / / / /
* | | | | Merge branch 'qa-ml-push-test-requires-admin' into 'master'Mark Lapierre2019-06-184-61/+95
|\ \ \ \ \
| * | | | | Test push limit with admin userMark Lapierre2019-06-184-61/+95
|/ / / / /
* | | | | Merge branch 'qa-create-merge-request-tests' into 'master'Mark Lapierre2019-06-185-48/+61
|\ \ \ \ \
| * | | | | Fixing trailing whitespace and other linter errorsqa-create-merge-request-testsTomislav Nikic2019-06-171-2/+2
| * | | | | Created a refreshed create merge request suiteTomislav Nikic2019-06-175-49/+62
* | | | | | Merge branch '60617-allow-switching-from-gitlab-managed-to-unmanaged-clusters...Thong Kuah2019-06-1810-11/+71
|\ \ \ \ \ \
| * | | | | | Allow switching clusters between managed/unmanagedTiger2019-06-1810-11/+71
* | | | | | | Merge branch 'readonly_k8s_integration' into 'master'Thong Kuah2019-06-1828-319/+132
|\ \ \ \ \ \ \
| * | | | | | | Make KubernetesService readonlyJames Fargher2019-06-1828-319/+132
|/ / / / / / /
* | | | | | | Merge branch 'migrate_k8s_service_integration' into 'master'Thong Kuah2019-06-175-6/+300
|\ \ \ \ \ \ \
| * | | | | | | When an instance cluster already exists migrate disabledmigrate_k8s_service_integrationJames Fargher2019-05-302-1/+40
| * | | | | | | Allow a user defined namespace on non-gitlab managed clustersJames Fargher2019-05-302-6/+30
| * | | | | | | Migrate Kubernetes service integration templates to clustersJames Fargher2019-05-303-0/+231
* | | | | | | | Merge branch 'merge-train-docs-change' into 'master'Mike Lewis2019-06-171-9/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Updated docs with suggested changesmerge-train-docs-changeDarby Frey2019-06-171-6/+2
| * | | | | | | Updated docs for Merge TrainsDarby Frey2019-06-171-5/+3
* | | | | | | | Merge branch '63079-exclude-k8s-namespaces-with-no-service-account-token' int...Thong Kuah2019-06-174-4/+100
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't use Kubernetes namespaces with no token63079-exclude-k8s-namespaces-with-no-service-account-tokenTiger2019-06-175-5/+101
* | | | | | | | | Merge branch 'issue-62685-new' into 'master'Andreas Brandl2019-06-173-0/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update changelog MRissue-62685-newyguo2019-06-171-1/+1
| * | | | | | | | | Add index on invite-email to membersyguo2019-06-173-0/+27
| | |/ / / / / / / | |/| | | | | | |