summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'docs-debug-cody' into 'master'Evan Read2019-08-052-0/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bring diagnostics_tools.md from debug project to docs See merge request gitlab-org/gitlab-ce!31399
| * | | | | Bring diagnostics_tools.md from debug project to docsMarcel Amirault2019-08-052-0/+29
|/ / / / /
* | | | | Merge branch 'docs-quick-action-labels' into 'master'Evan Read2019-08-051-0/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document when quotes aren't needed for quick actions Closes #63735 See merge request gitlab-org/gitlab-ce!31338
| * | | | | Document when quotes aren't needed for quick actionsSean McGivern2019-08-051-0/+13
|/ / / / /
* | | | | Merge branch 'add-missing-timezone-legacy-artifacts' into 'master'Stan Hu2019-08-051-6/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add missing timezone when copying legacy artifacts (ci_builds) See merge request gitlab-org/gitlab-ce!31447
| * | | | | Add missing timezone to legacy artifacts (ci_builds)David H. Wilkins2019-08-041-6/+12
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - ci_builds.artifacts_expire_at are copied to ci_job_artifacts.expire_at with incorrect timestamps when the database timezone is NOT utc - ci_builds.artifacts_expire_at is `timestamp without time zone` and ci_job_artifacts.expire_at is `timestamp with time zone` on postgresql - Tests fail locally for `rspec ./spec/lib/gitlab/import_export/import_export_spec.rb` without this change
* | | | | Merge branch 'jts/update-security-doc' into 'master'Robert Speicher2019-08-052-11/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates security templates [ci skip] See merge request gitlab-org/gitlab-ce!31431
| * | | | | Updates security templatesJohn Skarbek2019-08-052-11/+11
|/ / / / /
* | | | | Merge branch 'explicit-helm-factory-certs' into 'master'Michael Kozono2019-08-052-0/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use stubbed key and certificate in Helm factory See merge request gitlab-org/gitlab-ce!31169
| * | | | | Use stubbed certificate and key in Helm factoryexplicit-helm-factory-certsTiger2019-08-012-0/+23
| | | | | |
* | | | | | Merge branch 'id-fix-diverging-counts' into 'master'Stan Hu2019-08-051-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Use select instead of filter to support 2.5 See merge request gitlab-org/gitlab-ce!31480
| * | | | | Use select instead of filter to support 2.5Igor2019-08-051-1/+1
|/ / / / /
* | | | | Merge branch '64016-add-shell-style-guide-link-to-development-page' into ↵34558-clean-up-cohortsMarcia Ramos2019-08-051-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add shell scripting guides to development README Closes #64016 See merge request gitlab-org/gitlab-ce!31467
| * | | | | Add shell scripting guides to development READMEVictor Zagorodny2019-08-051-0/+4
|/ / / / /
* | | | | Merge branch 'bjk/worker_scale_doc' into 'master'Achilleas Pipinellis2019-08-051-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update Unicorn Worker recommendation See merge request gitlab-org/gitlab-ce!31404
| * | | | | Update Unicorn Worker recommendationbjk/worker_scale_docBen Kochie2019-08-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the Unicorn worker documentation based on the new scaling formula. https://gitlab.com/gitlab-org/omnibus-gitlab/issues/4535
* | | | | | Merge branch 'rz_es_update' into 'master'Achilleas Pipinellis2019-08-051-9/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs - Strongly discourage installing ES on the same server as GitLab See merge request gitlab-org/gitlab-ce!30169
| * | | | | | Docs - Strongly discourage installing ES on the same server as GitLabRonald van Zon2019-08-051-9/+12
|/ / / / / /
* | | | | | Merge branch ↵Douwe Maan2019-08-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '11467-remove-feature-flag-for-visual-review-app-button-ce-backport' into 'master' Remove visual review app feature flag See merge request gitlab-org/gitlab-ce!31429
| * | | | | | Remove visual review app feature flag11467-remove-feature-flag-for-visual-review-app-button-ce-backportshampton2019-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the CE backport for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14958 Now that we are confident with the visual review app link being there, we are removing the feature flag entirely.
* | | | | | | Merge branch 'improve-mr-enhance-style-of-the-shared-runners-limit' into ↵Kushal Pandya2019-08-052-9/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Refactor passing props to jobs/index.js See merge request gitlab-org/gitlab-ce!31472
| * | | | | | | Refactor passing props to jobs/index.jsAmmar Alakkad2019-08-052-9/+22
| | | | | | | |
* | | | | | | | Merge branch 'bvl-use-group-codeowners' into 'master'Douwe Maan2019-08-051-7/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Use groups in CODEOWNERS file See merge request gitlab-org/gitlab-ce!31477
| * | | | | | | Use groups in CODEOWNERS fileBob Van Landuyt2019-08-051-7/+7
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's dogfood https://gitlab.com/gitlab-org/gitlab-ce/issues/53182 That way we don't need to keep this file up to date.
* | | | | | | Merge branch '64729-update-troubleshooting-for-gzip-error-in-backup-docs' ↵Achilleas Pipinellis2019-08-051-0/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Update troubleshooting for gzip error in backup docs" Closes #64729 See merge request gitlab-org/gitlab-ce!30884
| * | | | | | | Resolve "Update troubleshooting for gzip error in backup docs"Alexander Strachan2019-08-051-0/+19
|/ / / / / / /
* | | | | | | Merge branch 'ce-62234-custom-metrics-help-text' into 'master'Achilleas Pipinellis2019-08-053-32/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify requirements for custom metrics in docs See merge request gitlab-org/gitlab-ce!31286
| * | | | | | | Add help text next to Custom Metrics sectionReuben Pereira2019-08-053-32/+38
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | - Also add requirements to the docs for custom metrics.
* | | | | | | Merge branch 'docs/update-gitaly-troubleshooting' into 'master'Achilleas Pipinellis2019-08-051-1/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Gitaly troubleshooting See merge request gitlab-org/gitlab-ce!30924
| * | | | | | | Update Gitaly troubleshootingCindy Pallares 🦉2019-08-051-1/+10
|/ / / / / / /
* | | | | | | Merge branch 'docs/fix-markdown-lint' into 'master'Sean McGivern2019-08-051-33/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some Markdown lint errors See merge request gitlab-org/gitlab-ce!31473
| * | | | | | | Fix some Markdown lint errorsAchilleas Pipinellis2019-08-051-33/+33
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30295
* | | | | | | Merge branch 'docs-update-secure-permissions' into 'master'Achilleas Pipinellis2019-08-051-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rules for secure features See merge request gitlab-org/gitlab-ce!31432
| * | | | | | | Update rules for secure featuresTetiana Chupryna2019-08-051-2/+4
|/ / / / / / /
* | | | | | | Merge branch 'docs/remove-cephfs-example' into 'master'Achilleas Pipinellis2019-08-051-8/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove CephFS from example See merge request gitlab-org/gitlab-ce!31422
| * | | | | | | Remove CephFS from exampledocs/remove-cephfs-exampleCindy Pallares 🦉2019-08-021-8/+8
| |/ / / / / / | | | | | | | | | | | | | | We recommend avoiding CephFS https://docs.gitlab.com/ee/administration/high_availability/nfs.html#avoid-using-cephfs-and-glusterfs
* | | | | | | Merge branch 'jramsay/partial-clone-docs' into 'master'Achilleas Pipinellis2019-08-052-0/+148
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add minimal partial clone docs Closes gitaly#1581 See merge request gitlab-org/gitlab-ce!30295
| * | | | | | Add minimal partial clone docsJames Ramsay2019-08-052-0/+148
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partial Clone and Sparse Checkout are the native Git approach to enormous repositories. We should document the state of these features and update as our support and Git's support for these features improves.
* | | | | | Merge branch 'review-app-stop' into 'master'Achilleas Pipinellis2019-08-052-4/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix docs review-app stages in the pipeline See merge request gitlab-org/gitlab-ce!31464
| * | | | | | Fix docs review-app stages in the pipelineMarcel Amirault2019-08-052-4/+3
|/ / / / / /
* | | | | | Merge branch 'jprovazn-fix-positioning' into 'master'Sean McGivern2019-08-055-78/+168
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize relative re-positioning See merge request gitlab-org/gitlab-ce!30938
| * | | | | | Use SQL to find the gap instead of iteratingHeinrich Lee Yu2019-08-054-147/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removes unnecessary methods causing extra queries
| * | | | | | Optimize rebalancing of relative positioningJan Provaznik2019-08-053-25/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving of neighbour items was done recursively - this was extremely expensive when multiple items had to be moved. This change optimizes the code to find nearest possible gap where items can be moved and moves all of them with single update query.
* | | | | | | Merge branch '60664-kubernetes-applications-uninstall-cert-manager' into ↵Thong Kuah2019-08-057-11/+79
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Kubernetes > Applications > Uninstall Cert Manager" See merge request gitlab-org/gitlab-ce!31166
| * | | | | | | Allow Cert-Manager to be uninstalled60664-kubernetes-applications-uninstall-cert-managerTiger2019-08-057-11/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our current version of Cert-Manager does not uninstall cleanly, and we must manually remove custom resource definitions.
* | | | | | | | Merge branch ↵Kushal Pandya2019-08-056-2/+14
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'update-pipelines-minutes-expiry-banner-to-an-alert-component-type' into 'master' Enhance style of the shared runners limit See merge request gitlab-org/gitlab-ce!31386
| * | | | | | | Enhance style of the shared runners limitAmmar Alakkad2019-08-056-2/+14
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | It also prepare for the EE merge request https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14786
* | | | | | | Merge branch 'ce-mw-updgrade-gitlab-ui-5-12-1' into 'master'Kushal Pandya2019-08-050-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (CE Port) Upgrade gitlab-ui to 5.12.1 See merge request gitlab-org/gitlab-ce!31466
| * | | | | | | Upgrade gitlab-ui to 5.12.1ce-mw-updgrade-gitlab-ui-5-12-1Martin Wortschack2019-08-052-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update yarn.lock
* | | | | | | | Merge branch 'renovate/gitlab-ui-5.x' into 'master'Kushal Pandya2019-08-052-7/+7
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to v5.12.1 See merge request gitlab-org/gitlab-ce!31461