summaryrefslogtreecommitdiff
path: root/doc/development
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'merge-train' into 'master'Rémy Coutable2018-12-041-177/+106
|\ | | | | | | | | Automatically merge CE master into EE master See merge request gitlab-org/gitlab-ce!23453
| * Updated documentation of CE to EE mergesYorick Peterse2018-12-041-177/+106
| | | | | | | | | | This updates the documentation of automatic CE to EE merges to cover the new automatic merging setup.
* | Merge branch 'master' into 'patch-28'Rémy Coutable2018-12-0480-2563/+2796
|\ \ | | | | | | | | | # Conflicts: # doc/development/i18n/proofreader.md
| * | Make docs about expect_next_instance_of consistentLin Jen-Shin2018-12-031-3/+3
| |/ | | | | | | | | | | So we compare `expect_any_instance_of` with `expect_next_instance_of`, but still mention `allow_any_instance_of`.
| * Merge branch 'patch-31' into 'master'Achilleas Pipinellis2018-12-031-1/+1
| |\ | | | | | | | | | | | | Update architecture.md See merge request gitlab-org/gitlab-ce!23430
| | * Update architecture.mdB1nj0y2018-11-291-1/+1
| | |
| * | Merge branch 'if-52811-fix_namespaces_api_routing' into 'master'Nick Thomas2018-11-301-1/+1
| |\ \ | | | | | | | | | | | | | | | | Fix API::Namespaces routing to accept namepaces with dots See merge request gitlab-org/gitlab-ce!22912
| | * | Fix API::Namespaces to accept namepaces with dotsif-52811-fix_namespaces_api_routingImre Farkas2018-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | It also renames the API::PROJECT_ENDPOINT_REQUIREMENTS constant to API::NAMESPACE_OR_PROJECT_REQUIREMENTS
| * | | Fix Red/Orange data link markdownPhilippe Lafoucrière2018-11-301-1/+1
| | | |
| * | | Merge branch ↵Rémy Coutable2018-11-291-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'docs/8608-update-approval-guidelines-to-include-red-orange-data-reviews' into 'master' Add RED data security requirement to code review See merge request gitlab-org/gitlab-ce!23426
| | * | | Add RED data security requirement to code reviewPhilippe Lafoucrière2018-11-281-0/+2
| | | |/ | | |/| | | | | | | | | closes #8608
| * | | Merge branch 'mk/author-preparation-docs' into 'master'Marcia Ramos2018-11-291-0/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Encourage MR author preparation in Code Review Guidelines documentation See merge request gitlab-org/gitlab-ce!23360
| | * | | Encourage MR author preparationMichael Kozono2018-11-281-0/+17
| | | | |
| * | | | Merge branch 'fe-apollo-docs' into 'master'Filipa Lacerda2018-11-292-0/+86
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Added frontend GraphQL docs See merge request gitlab-org/gitlab-ce!23405
| | * | | Added frontend GraphQL docsPhil Hughes2018-11-282-0/+86
| | |/ /
| * | | Merge branch '50341-cleanup-useless-project-import-attributes' into 'master'Douwe Maan2018-11-281-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Removes all the irrelevant code and columns that were migrated from the Project… See merge request gitlab-org/gitlab-ce!21497
| | * | | Removes all the irrelevant import related code and columnsTiago Botelho2018-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Clears the import related columns and code from the Project model over to the ProjectImportState model
| * | | | Left shift security in our workflowPhilippe Lafoucrière2018-11-281-12/+37
| | | | |
| * | | | Merge branch '49570-add-review_qa-job' into 'master'Sean McGivern2018-11-281-35/+49
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an automatic job to run QA smoke tests against Review Apps Closes #49570 See merge request gitlab-org/gitlab-ce!22853
| | * | | | Add a manual job to run QA against a Review App49570-add-review_qa-jobRémy Coutable2018-11-261-35/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Renames review to review-deploy. 2. Renames stop_review to review-stop. 3. Adds a build-qa-image job to the prepare stage and save the QA Docker image as artifact (example: https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/120967019). 4. Adds a manual review-qa job to the test stage to run QA tests against the Review App (example: https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/120967238). 5. Make the review-deploy job plays the review-qa job as soon as the Review App is deployed (example: https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/120988775). 6. Updates the Review Apps documentation accordingly. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Merge branch 'more-guidelines-on-when-to-squash' into 'master'Dmitriy Zaporozhets2018-11-281-0/+3
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | Clearer docs when it is OK for maintainer to squash See merge request gitlab-org/gitlab-ce!23376
| | * | | | Clearer docs when it is OK for maintainer to squashDylan Griffith2018-11-271-0/+3
| | | |/ / | | |/| |
| * | | | Merge branch 'json-logging-for-k8s' into 'master'Stan Hu2018-11-271-5/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Json logging for k8s Integration See merge request gitlab-org/gitlab-ce!23328
| | * | | | Correct errors in doc/development/logging.mdDylan Griffith2018-11-231-5/+5
| | | |/ / | | |/| |
| * | | | Merge branch 'docs/skip-auto-reconfigure' into 'master'Marcia Ramos2018-11-271-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Replace deprecated skip-auto-migrations occurrence Closes #45031 See merge request gitlab-org/gitlab-ce!23326
| | * | | Replace deprecated skip-auto-migrations occurrencedocs/skip-auto-reconfigureAchilleas Pipinellis2018-11-231-1/+1
| | | | |
| * | | | Merge branch 'docs/fix-some-grammar' into 'master'Achilleas Pipinellis2018-11-2713-13/+13
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Fix minor grammar issues See merge request gitlab-org/gitlab-ce!23372
| | * | | Fix minor grammar issuesEvan Read2018-11-2713-13/+13
| | | | |
| * | | | Merge branch '54230-eliminate-duplicated-words' into 'master'Evan Read2018-11-275-9/+9
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Eliminate duplicated words (for docs) See merge request gitlab-org/gitlab-ce!23183
| | * | | Eliminate duplicated wordsTakuya Noguchi2018-11-225-9/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Merge branch 'ce-rd-extract-ee-specific-sidekiq-queue-config' into 'master'Robert Speicher2018-11-261-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport of gitlab-ee!8470 See merge request gitlab-org/gitlab-ce!23150
| | * | | | Backport of gitlab-ee!8470ce-rd-extract-ee-specific-sidekiq-queue-configRubén Dávila2018-11-191-2/+2
| | | | | |
| * | | | | Merge branch 'docs/ce-to-ee-no-squash' into 'master'Rémy Coutable2018-11-261-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instruct against squashing in CE to EE MRs See merge request gitlab-org/gitlab-ce!23330
| | * | | | | Instruct against squashing in CE to EE MRsdocs/ce-to-ee-no-squashAchilleas Pipinellis2018-11-231-0/+3
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'sh-improve-prettier-docs' into 'master'Phil Hughes2018-11-261-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix documentation on using prettier for a specific directory See merge request gitlab-org/gitlab-ce!23336
| | * | | | | Fix documentation on using prettier for a specific directorysh-improve-prettier-docsStan Hu2018-11-231-2/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the `check` parameter is used, the `allFiles` parameter is `false`, which causes the prettier.js script only to process staged files. The correct parameters are `check-all` and `save-all`.
| * | | | | Merge branch 'docs-add-missing-languages-in-proofreaders-page' into 'master'Achilleas Pipinellis2018-11-231-1/+45
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Add missing languages in Proofreaders page See merge request gitlab-org/gitlab-ce!23243
| | * | | | Add missing languages in Proofreaders pagedocs-add-missing-languages-in-proofreaders-pageRémy Coutable2018-11-201-1/+45
| | | |/ / | | |/| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Docs: Cleaning up various linksMarcel Amirault2018-11-211-2/+1
| | |_|/ | |/| |
| * | | deprecate UX Guide and redirect to design.gitlabSarrah Vesselov2018-11-2116-1464/+43
| |/ /
| * | Merge branch 'improve_migrations_docs' into 'master'Yorick Peterse2018-11-201-3/+3
| |\ \ | | | | | | | | | | | | | | | | Documentation: Correct inaccurate phrase related to disable_ddl_transaction mode See merge request gitlab-org/gitlab-ce!21175
| | * | Correct inaccurate phrase related to disable_ddl_transaction modeimprove_migrations_docsNikolay2018-08-141-3/+3
| | | |
| * | | Merge branch 'gt-fix-typos-in-specs-and-docs' into 'master'Evan Read2018-11-192-3/+3
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Fix typos in specs and docs See merge request gitlab-org/gitlab-ce!23084
| | * | Fix typos in docsGeorge Tsiolis2018-11-162-3/+3
| | | |
| * | | Update architecture.md to have a component by component overviewLee Matos2018-11-161-23/+166
| | | |
| * | | Merge branch 'docs/fix_changelog_type_documentation' into 'master'Achilleas Pipinellis2018-11-161-9/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Add missing `performance` to changelog type doc See merge request gitlab-org/gitlab-ce!22733
| | * | | Add missing `performance` to changelog type docdocs/fix_changelog_type_documentationPhilippe Lafoucrière2018-11-011-9/+9
| | | | |
| * | | | Validate foreign keys being indexedKamil Trzciński2018-11-151-6/+1
| | | | |
| * | | | Add missing space to logging docsh-structured-logs-docsStan Hu2018-11-141-1/+1
| | | | |
| * | | | Add documentation on how to use structured loggingStan Hu2018-11-142-0/+145
| | | | |
View Lorry Controller Status