summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update wording per suggestiondocs-blunceford-before-sha-fixBlair Lunceford2019-06-211-1/+1
* Update predefined_variables.mdBlair Lunceford2019-06-201-1/+1
* Merge branch 'zj-gitaly-usage-data' into 'master'Stan Hu2019-06-205-3/+34
|\
| * Add Gitaly data to the usage pingZeger-Jan van de Weg2019-06-205-3/+34
* | Merge branch '12174-add-remove-child-epic-quick-actions-doc-ce' into 'master'cmcfarland/testAchilleas Pipinellis2019-06-201-5/+7
|\ \
| * | Add documentation on epic add/remove child relations quick actions12174-add-remove-child-epic-quick-actions-doc-ceAlexandru Croitor2019-06-201-5/+7
* | | Merge branch 'bvl-fix-application-setting-spec-ce' into 'master'Mayra Cabrera2019-06-201-2/+7
|\ \ \
| * | | Use next_instance_of instead of any_instance_ofBob Van Landuyt2019-06-201-2/+7
* | | | Merge branch 'config-yaml-differences' into 'master'Robert Speicher2019-06-2010-11/+293
|\ \ \ \ | |/ / / |/| | |
| * | | Backport gitlab.yml.example from EEconfig-yaml-differencesYorick Peterse2019-06-206-9/+258
| * | | Backport Prometheus YAML config from EEYorick Peterse2019-06-201-2/+2
| * | | Backport Sidekiq queue names from EEYorick Peterse2019-06-201-0/+17
| * | | Backport dependency decisions from EEYorick Peterse2019-06-191-0/+7
| * | | Backport EE YAML settings for PostgreSQLYorick Peterse2019-06-191-0/+9
* | | | Merge branch '57973-errors-in-application-settings-panel-shows-wrong-panel' i...Sean McGivern2019-06-2028-68/+117
|\ \ \ \
| * | | | Update application settings using correct actionBrett Walker2019-06-1928-68/+117
* | | | | Merge branch 'fix-failing-master-graphql-import' into 'master'Sean McGivern2019-06-201-1/+1
|\ \ \ \ \
| * | | | | Fixed failing GraphQL file importPhil Hughes2019-06-201-1/+1
* | | | | | Merge branch 'severity-doc-update' into 'master'Mek Stittri2019-06-201-26/+26
|\ \ \ \ \ \
| * | | | | | Improve bug severity definitions and consolidate guidance for clarityMek Stittri2019-06-201-26/+26
|/ / / / / /
* | | | | | Merge branch 'embedded-metrics-be' into 'master'Sean McGivern2019-06-2010-17/+196
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add embedding flag and filter to CPU/MemSarah Yasonik2019-06-2010-17/+196
|/ / / / /
* | | | | Merge branch 'last-commit-repo-widget' into 'master'Filipa Lacerda2019-06-206-0/+397
|\ \ \ \ \
| * | | | | Render tree last commit widget with VuePhil Hughes2019-06-196-0/+397
* | | | | | Merge branch '63510-error-parsing-true-boolean-in-gitlab-jsoncache' into 'mas...Ash McKenzie2019-06-202-1/+11
|\ \ \ \ \ \
| * | | | | | Gitlab::JsonCache#parse_value ensure string63510-error-parsing-true-boolean-in-gitlab-jsoncacheAsh McKenzie2019-06-202-1/+11
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'master-i18n' into 'master'Bob Van Landuyt2019-06-2045-1209/+2829
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | New translations gitlab.pot (Portuguese)Luke Bennett2019-06-2045-1209/+2829
|/ / / / /
* | | | | Merge branch 'link_to_issue_statistics_api_endpoint_in_docs' into 'master'Achilleas Pipinellis2019-06-201-0/+3
|\ \ \ \ \
| * | | | | Link issue statistics api endpoint in the docslink_to_issue_statistics_api_endpoint_in_docsAlexandru Croitor2019-06-201-0/+3
* | | | | | Merge branch 'docs-update-container-registry-api' into 'master'Achilleas Pipinellis2019-06-201-0/+5
|\ \ \ \ \ \
| * | | | | | Update Docs for Container Registry API Delete EndpointsJason Goodman2019-06-201-0/+5
|/ / / / / /
* | | | | | Merge branch 'docs/existing-knative-edit' into 'master'Achilleas Pipinellis2019-06-201-4/+14
|\ \ \ \ \ \
| * | | | | | Add version text and edit sectionEvan Read2019-06-201-4/+14
|/ / / / / /
* | | | | | Merge branch 'docs/edit-zoom-call-link-content' into 'master'Achilleas Pipinellis2019-06-201-2/+9
|\ \ \ \ \ \
| * | | | | | Edit new Zoom call link contentEvan Read2019-06-201-2/+9
|/ / / / / /
* | | | | | Merge branch 'graphql-file-renames' into 'master'Kushal Pandya2019-06-2011-6/+6
|\ \ \ \ \ \
| * | | | | | Rename graphql files to match frontend docsPhil Hughes2019-06-1911-6/+6
* | | | | | | Merge branch 'docs-registry-restore-workaround' into 'master'Achilleas Pipinellis2019-06-201-0/+31
|\ \ \ \ \ \ \
| * | | | | | | Document the workaround for issues after registry restoreDJ Mountney2019-06-201-0/+31
|/ / / / / / /
* | | | | | | Merge branch 'sh-remove-import-columns-from-projects' into 'master'Douwe Maan2019-06-205-8/+22
|\ \ \ \ \ \ \
| * | | | | | | Remove import columns from projects tablesh-remove-import-columns-from-projectsStan Hu2019-06-195-8/+22
* | | | | | | | Merge branch 'bvl-markdown-graphql' into 'master'Douwe Maan2019-06-2019-19/+207
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Render GFM html in GraphQLBob Van Landuyt2019-06-2019-19/+207
|/ / / / / / /
* | | | | | | Merge branch 'fix/facivon-url-if-uploads-object-store-enabled' into 'master'Stan Hu2019-06-202-6/+7
|\ \ \ \ \ \ \
| * | | | | | | fix(favicon): get favicon_path, so it works also with uploads object storeRoger Meier2019-06-142-6/+7
* | | | | | | | Merge branch 'expose-saml-provider-id-to-users-api' into 'master'Stan Hu2019-06-195-25/+37
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Updating CE repo to include new EE users API changesMichael Leopard2019-06-195-25/+37
|/ / / / / / /
* | | | | | | Merge branch 'docs-gitaly-without-nfs' into 'master'Mike Lewis2019-06-191-0/+18
|\ \ \ \ \ \ \
| * | | | | | | Minor edits to Eliminating NFS sectionMike Lewis2019-06-191-9/+9