summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Streamline component detail listjl-reorganize-architecture-page-docsJoshua Lambert2019-05-171-47/+22
* Fix broken tables, re-arrange overviewJoshua Lambert2019-05-171-57/+69
* Additional details on architecture pageJoshua Lambert2019-05-171-67/+186
* Updates to components pageJoshua Lambert2019-05-171-3/+25
* Add additional process descriptions, add self-monitor descriptionJoshua Lambert2019-05-171-25/+37
* Update language for self-monitor, fix runner linkJoshua Lambert2019-05-161-5/+5
* Resolve conflicts on architecture pageJoshua Lambert2019-05-161-138/+181
* Merge branch 'docs-followup-28043' into 'master'Achilleas Pipinellis2019-05-173-9/+7
|\
| * Docs: Add badges and fix redirect style in 3 docsMarcel Amirault2019-05-173-9/+7
|/
* Merge branch 'docs-followup-27956' into 'master'Achilleas Pipinellis2019-05-171-24/+24
|\
| * Docs: Update links and add badge to examples readmeMarcel Amirault2019-05-171-24/+24
|/
* Merge branch 'docs-followup-27943' into 'master'Achilleas Pipinellis2019-05-1715-0/+0
|\
| * Docs: Delete orphaned images in `merge_requests/img`Marcel Amirault2019-05-1715-0/+0
|/
* Merge branch 'docs/single-docs-resync' into 'master'Evan Read2019-05-171-2/+4
|\
| * Resync the docs that were submitted to EE instead of CEAchilleas Pipinellis2019-05-161-2/+4
* | Merge branch '61914-fix-emojis-urls' into 'master'Achilleas Pipinellis2019-05-172-5/+10
|\ \
| * | Fix emojis URLsPaul Gascou-Vaillancourt2019-05-172-5/+10
|/ /
* | Merge branch 'jl-add-component-subheadings-docs' into 'master'Achilleas Pipinellis2019-05-171-3/+7
|\ \
| * | Add subheadings to components in architecture pagejl-add-component-subheadings-docsJoshua Lambert2019-05-161-3/+7
* | | Merge branch 'docs/force-auth-mr-12-0' into 'master'Evan Read2019-05-161-0/+12
|\ \ \ | |_|/ |/| |
| * | Fix docs intro version for force auth for approversAchilleas Pipinellis2019-05-161-0/+12
|/ /
* | Merge branch 'fe-use-process-timer-in-jest-timeout' into 'master'Fatih Acet2019-05-161-10/+17
|\ \
| * | Use process timer for jest timeout testingfe-use-process-timer-in-jest-timeoutPaul Slaughter2019-05-081-10/+17
* | | Merge branch 'sh-bump-gitlab-shell-9.2.0' into 'master'Douglas Barbosa Alexandre2019-05-161-1/+1
|\ \ \
| * | | Upgrade gitlab-shell to 9.2.0Stan Hu2019-05-161-1/+1
* | | | Merge branch 'haml-lint-fe' into 'master'Douglas Barbosa Alexandre2019-05-161-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Add haml-lint.yml to FE for roulettehaml-lint-feLuke Bennett2019-05-131-0/+2
* | | | Merge branch 'admin-user-access-levels-scb' into 'master'Phil Hughes2019-05-161-0/+2
|\ \ \ \
| * | | | Resolve CE/EE diffs in admin user access levelsadmin-user-access-levels-scbLuke Bennett2019-05-161-0/+2
* | | | | Merge branch 'mirror-repos-scb' into 'master'Phil Hughes2019-05-161-1/+1
|\ \ \ \ \
| * | | | | Resolve CE/EE diffs in mirror repos settingsmirror-repos-scbLuke Bennett2019-05-161-1/+1
* | | | | | Merge branch 'docs-render_if_exists-opts-caveat' into 'master'Phil Hughes2019-05-161-1/+13
|\ \ \ \ \ \
| * | | | | | Explain render_if_exists opts caveatdocs-render_if_exists-opts-caveatLuke Bennett2019-05-161-1/+13
* | | | | | | Merge branch 'docs-what-to-do-if-review-jobs-keep-failing' into 'master'Sean McGivern2019-05-161-6/+16
|\ \ \ \ \ \ \
| * | | | | | | Document what to do if review jobs keep failingRémy Coutable2019-05-161-6/+16
* | | | | | | | Merge branch 'ce-2087-make-num-shards-configurable' into 'master'Sean McGivern2019-05-163-1/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | CE backport of "Configure the number of ES shards and replicas"Nick Thomas2019-05-163-1/+15
* | | | | | | | | Merge branch 'jc-omit-count-diverging-commits-max' into 'master'Lin Jen-Shin2019-05-164-4/+63
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Omit max-count for diverging_commit_counts behind feature flagjc-omit-count-diverging-commits-maxJohn Cai2019-05-144-4/+63
* | | | | | | | | Merge branch 'diff-filter-bar-placeholder-text' into 'master'Filipa Lacerda2019-05-162-2/+9
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Changed the placeholder text of the diff tree filter inputPhil Hughes2019-05-162-2/+9
* | | | | | | | | Merge branch 'disallow-review-deploy-to-fail' into 'master'Sean McGivern2019-05-161-3/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Disallow the review-deploy and review-qa-smoke jobs to faildisallow-review-deploy-to-failRémy Coutable2019-05-151-3/+2
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'reg-captcha-flag' into 'master'Nick Thomas2019-05-163-14/+33
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add :registrations_recaptcha feature flagLuke Bennett2019-05-163-14/+33
* | | | | | | | | | Merge branch 'fix_failure_migrate_on_mysql8' into 'master'Stan Hu2019-05-162-1/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix. db:migrate is failed on MySQL 8sue4452019-05-162-1/+7
* | | | | | | | | | | Merge branch '49915-fix-error-500-admin-projects-nil-storage' into 'master'Stan Hu2019-05-167-5/+64
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix an error in projects admin when statistics are missingRémy Coutable2019-05-167-5/+64
* | | | | | | | | | | | Merge branch 'docs-render_if_exists-relative-path' into 'master'Phil Hughes2019-05-161-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \