summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '11-11-stable-prepare-rc5' into '11-11-stable'Yorick Peterse2019-05-2118-54/+79
|\ | | | | | | | | Prepare 11.11.0-rc5 release See merge request gitlab-org/gitlab-ce!28537
| * Merge branch 'docs/minor-edit-of-unintall-apps-docs' into 'master'11-11-stable-prepare-rc5Achilleas Pipinellis2019-05-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | Slight edit of text from earlier merge Closes #61447 See merge request gitlab-org/gitlab-ce!28511 (cherry picked from commit 890fe4ea3d594386cd8698ebb69b7188660a88eb) 208dc117 Slight edit of text from earlier merge
| * Merge branch 'update-docs-alert-bot' into 'master'Achilleas Pipinellis2019-05-211-1/+1
| | | | | | | | | | | | | | | | | | Add to docs sentence about alertbot opening issues See merge request gitlab-org/gitlab-ce!28503 (cherry picked from commit 5396b2a81aba6ed2bf85906a3256e171337b6df0) afcbebd9 Add to docs sentence about alertbot opening issues
| * Merge branch 'docs-play-all-manual-jobs-in-a-stage' into 'master'Achilleas Pipinellis2019-05-211-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds documentation for 'Play all manual' button See merge request gitlab-org/gitlab-ce!28502 (cherry picked from commit 7a9a65e5b4b105c54bc86d3686026ad6fc69175d) 32a99c6c Adds documentation for stage button 4ec9f042 Apply suggestion to doc/ci/pipelines.md 062844cc Apply suggestion to doc/ci/pipelines.md ecc7b72a Apply suggestion to doc/ci/pipelines.md c4bcf858 Apply suggestion to doc/ci/pipelines.md b0b16210 Apply suggestion to doc/ci/pipelines.md
| * Merge branch 'sh-fix-rugged-get-tree-entries-recursive' into 'master'Douglas Barbosa Alexandre2019-05-213-1/+10
| | | | | | | | | | | | | | | | | | | | | | API: Fix recursive flag not working with Rugged get_tree_entries flag Closes #61979 See merge request gitlab-org/gitlab-ce!28494 (cherry picked from commit d951f047198d3ee03604fb64f6ad96efae6cba54) c1827f1c API: Fix recursive flag not working with Rugged get_tree_entries flag
| * Merge branch 'revert-47e5eedc' into 'master'Grzegorz Bizon2019-05-213-36/+0
| | | | | | | | | | | | | | | | | | Revert "Merge branch '55127-add-delay-after-mr-creation-for-async-tasks-to-complete' into 'master'" See merge request gitlab-org/gitlab-ce!28492 (cherry picked from commit a5f810c9b18d63778a9cd5dc1d2c288e68b1497a) c04ea583 Revert "Merge branch '55127-add-delay-after-mr-creation-for-async-tasks-to-complete' into 'master'"
| * Merge branch '62038-chevron-down' into 'master'Phil Hughes2019-05-212-1/+6
| | | | | | | | | | | | | | | | | | | | | | Adds arrow icons to select menu in CI/CD settings Closes #62038 See merge request gitlab-org/gitlab-ce!28476 (cherry picked from commit 3c8bc8078fce318457f1f0565f19252d63f2565b) 64f040e2 Adds arrow icons to select option in CI/CD settings
| * Merge branch 'tr-update-group-security-dashboard-docs' into 'master'Achilleas Pipinellis2019-05-211-0/+0
| | | | | | | | | | | | | | | | | | Update group security dashboard docs - CE backport See merge request gitlab-org/gitlab-ce!28471 (cherry picked from commit d9877120e2c202ec1f3cee0e586f90b92e3eed85) 6afda6d6 Update group security dashboard screenshot
| * Merge branch 'docs/clarify-defaulting-behaviour-pipelines-for-mr' into 'master'Achilleas Pipinellis2019-05-211-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Fix content to not contradict Closes #61270 See merge request gitlab-org/gitlab-ce!28456 (cherry picked from commit 0bf8204a266ad8e836c49247470a8360123fa503) ec3e0da8 Fix content to not contradict 19b05a42 Apply suggestion to doc/ci/merge_request_pipelines/index.md
| * Merge branch 'docs-instance_level_clusters' into 'master'Evan Read2019-05-213-6/+31
| | | | | | | | | | | | | | | | | | | | | | Initial instance level cluster docs See merge request gitlab-org/gitlab-ce!27873 (cherry picked from commit 961a5f72f7f043540bf6e391edc3789a519f58bd) 96cec8bf Initial instance level cluster docs a951adb6 Apply suggestion to doc/user/project/clusters/index.md 719b7a07 Apply suggestion to doc/user/group/clusters/index.md
| * Merge branch 'fl-fix-next-flag-for-good-rc5' into '11-11-stable-prepare-rc5'Yorick Peterse2019-05-213-3/+9
| |\ |/ / | | | | | | Port for RC5 of Next badge must be visible when canary flag is true See merge request gitlab-org/gitlab-ce!28540
| * Next badge must be visible when canary flag is truefl-fix-next-flag-for-good-rc5Filipa Lacerda2019-05-213-3/+9
|/
* Update VERSION to 11.11.0-rc4v11.11.0-rc4GitLab Release Tools Bot2019-05-201-1/+1
|
* Merge branch '11-11-stable-prepare-rc4' into '11-11-stable'60879-test-11-11-stable-prepare-rc4Robert Speicher2019-05-2028-212/+541
|\ | | | | | | | | Prepare 11.11.0-rc4 release See merge request gitlab-org/gitlab-ce!28479
| * Merge branch 'revert-c5a9bc17' into 'master'Yorick Peterse2019-05-209-153/+29
| | | | | | | | | | | | | | | | | | Revert "Merge branch '56850-add-new-unicorn-metrics' into 'master'" See merge request gitlab-org/gitlab-ce!28483 (cherry picked from commit c775e88c0ec0e9916227a410cc09e2bbca4a92ce) 2334b077 Revert "Merge branch '56850-add-new-unicorn-metrics' into 'master'"
| * Merge branch 'dz-improve-ci-id-migration' into 'master'11-11-stable-prepare-rc4Sean McGivern2019-05-201-2/+7
| | | | | | | | | | | | | | | | | | Add extra checks for ci_id migration See merge request gitlab-org/gitlab-ce!28404 (cherry picked from commit 30a60ee4a0373b184bc1a825bf332ee357d5f899) 5786de36 Add extra checks for ci_id migration
| * Merge branch 'docs-sso-enforcement-ce' into 'master'James Lopez2019-05-201-2/+10
| | | | | | | | | | | | | | | | | | SSO enforcement docs details added from 11.11 See merge request gitlab-org/gitlab-ce!28394 (cherry picked from commit 64a17ba84128721d3d0138376eaf78030ab00a4c) 23cfce3e SSO enforcement docs details added from 11.11
| * Merge branch 'docs/single-docs-resync' into 'master'Evan Read2019-05-201-2/+4
| | | | | | | | | | | | | | | | | | Resync the docs that were submitted to EE instead of CE See merge request gitlab-org/gitlab-ce!28389 (cherry picked from commit 513b03917acc020f51b0fb2f8b4463a8b63a5e01) ed02e2f5 Resync the docs that were submitted to EE instead of CE
| * Merge branch 'sh-fix-personal-snippet-uploads-object-storage' into 'master'Sean McGivern2019-05-204-31/+114
| | | | | | | | | | | | | | | | | | | | | | Fix incorrect prefix used in new uploads for personal snippets Closes #61671 See merge request gitlab-org/gitlab-ce!28337 (cherry picked from commit f38265daa57d241bd9282279d11fcebd71bc6ea2) a1f44c1b Fix incorrect prefix used in new uploads for personal snippets
| * Merge branch 'rd-add-additional-notes-for-extra-ci-minutes-purchase-docs' ↵Achilleas Pipinellis2019-05-201-1/+9
| | | | | | | | | | | | | | | | | | | | | | into 'master' Update CI minutes docs regarding transferring of minutes and billing See merge request gitlab-org/gitlab-ce!28293 (cherry picked from commit ac232949952559d8441e743219dc726aed552f3c) 6a2875e1 Update extra CI minutes docs
| * Merge branch ↵Achilleas Pipinellis2019-05-204-19/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '61376-add-documentation-about-how-to-enable-puma-web-server-for-installations-from-source' into 'master' Add documentation about how to enable Puma web server for installations from source Closes #61376 See merge request gitlab-org/gitlab-ce!28235 (cherry picked from commit 5ec4052281da296f40d6eec90301cbf44c93f5c4) c06dfd9d Replace Unicorn with web server in the init.d script [ci skip] 95afca31 Add puma example for production [ci skip] f2c6bfbe Add using Puma section to install from source [ci skip] 5ebf0492 Add Puma web server support to init.d file aa7b053c Minor doc improvements to Puma instructions 29e49b45 Apply suggestion to doc/install/installation.md 6a691fa7 Apply suggestion to doc/install/installation.md
| * Merge branch 'sh-fix-invited-members' into 'master'Rémy Coutable2019-05-203-2/+27
| | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when inviting user already present Closes #61574 See merge request gitlab-org/gitlab-ce!28198 (cherry picked from commit a0da5e08ec566fb4c571391cb8281bced25ce35d) f1640616 Fix Error 500 when inviting user already present
| * Merge branch 'docs/dependency-proxy-ce' into 'master'Achilleas Pipinellis2019-05-204-0/+228
|/ | | | | | | | | | | | | | | | Add documentation for dependency proxy feature See merge request gitlab-org/gitlab-ce!28096 (cherry picked from commit f4dfbb688d979a81abe26dd84af0ace875dabe5a) 516344b9 Add documentation for dependency proxy feature 084fee73 Merge branch 'master' into docs/dependency-proxy-ce 14b9e8a5 Copyedit Dependency Proxy docs 10811da0 Link dependency proxy to the group index page 900d40ab Add example of a namespaced Docker image d7e2b4a7 Add link to Puma for source installations 18e68c5e Merge branch 'master' into docs/dependency-proxy-ce ac62bff2 Add note about data retention and fix heading
* Update VERSION to 11.11.0-rc3v11.11.0-rc3GitLab Release Tools Bot2019-05-161-1/+1
|
* Merge branch '11-11-stable-prepare-rc3' into '11-11-stable'Marin Jankovski2019-05-1637-75/+312
|\ | | | | | | | | Prepare 11.11.0-rc3 release See merge request gitlab-org/gitlab-ce!28313
| * Merge branch 'include-ee-fixtures' into 'master'Stan Hu2019-05-162-0/+9
| | | | | | | | | | | | | | | | | | Add EE fixtures to SeedFu fixture paths See merge request gitlab-org/gitlab-ce!28241 (cherry picked from commit 894c8e235bb30c1506b69a609b8d65240f7a6814) a4fea21e Add EE fixtures to SeedFu path
| * Merge branch 'fe-header-row' into 'master'Phil Hughes2019-05-167-28/+61
| | | | | | | | | | | | | | | | | | | | | | Adds header column to variables list Closes #46806 See merge request gitlab-org/gitlab-ce!28060 (cherry picked from commit 69cfdfaed3e5a63bc8af39ca4b42c932db1b7f75) 31861b0f Adds header column to variables list
| * Merge branch 'doc-jej/session-stored-globaly' into 'master'Evan Read2019-05-162-0/+66
| | | | | | | | | | | | | | | | | | Adds developer documentation for accessing session data in GitLab See merge request gitlab-org/gitlab-ce!27996 (cherry picked from commit fa33b5cede52688895ac063f239bc7084bd8bfc7) 35658e1d Document ways of accessing Session data in GitLab
| * Merge branch 'fix-project-visibility-level-validation' into 'master'11-11-stable-prepare-rc3Stan Hu2019-05-143-2/+18
| | | | | | | | | | | | | | | | | | | | | | Fix project visibility level validation Closes #59379 See merge request gitlab-org/gitlab-ce!28305 (cherry picked from commit 99637084b22abdf7b1f6d46daad80faf8181f3cd) b5540112 Fix project visibility level validation
| * Merge branch '61550-next-badge' into 'master'Phil Hughes2019-05-142-1/+6
| | | | | | | | | | | | | | | | | | | | | | Fixes next badge being always visible Closes #61550 See merge request gitlab-org/gitlab-ce!28249 (cherry picked from commit 3ec966ade28393ee8f72e9537205c00ff932be69) f769f539 Fixes next badge being always visible
| * Merge branch 'sh-revert-full-gc-after-import' into 'master'Rémy Coutable2019-05-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | Don't run full gc in AfterImportService Closes gitlab-ee#11556 See merge request gitlab-org/gitlab-ce!28239 (cherry picked from commit 4c16ce118498a2e3b98ad069000031fa9c55fcd3) 36b1a2d7 Don't run full gc in AfterImportService
| * Merge branch 'update-ci-minutes-doc' into 'master'Achilleas Pipinellis2019-05-141-2/+1
| | | | | | | | | | | | | | | | | | Update CI minutes docs to reflect this is available to all plans See merge request gitlab-org/gitlab-ce!28237 (cherry picked from commit 3f29c2b593f12259b79c682a84c513b68f20c7cb) fca1835b Update CI minutes docs
| * Merge branch 'sh-fix-lfs-download-errors' into 'master'Douglas Barbosa Alexandre2019-05-143-2/+35
| | | | | | | | | | | | | | | | | | | | | | Properly handle LFS Batch API response in project import Closes #61624 See merge request gitlab-org/gitlab-ce!28223 (cherry picked from commit 9dc41a0993a38f99eeda9c2e8bb3ace070003496) e67481e0 Properly handle LFS Batch API response in project import
| * Merge branch 'ce-jej/group-saml-project-enforcement' into 'master'Nick Thomas2019-05-141-0/+4
| | | | | | | | | | | | | | | | | | CE Changes for SSO enforcement in ProjectPolicy See merge request gitlab-org/gitlab-ce!28208 (cherry picked from commit 1a90a9bb09138969c784aaf5395456ceaa3e5d89) b95a0690 SSO enforcement for project resources
| * Merge branch ↵Kushal Pandya2019-05-142-1/+6
| | | | | | | | | | | | | | | | | | | | | | 'ce-11542-remove-non-semantic-use-of-row-in-member-listing-controls' into 'master' CE backport: Remove non-semantic use of `.row` in member listing controls See merge request gitlab-org/gitlab-ce!28204 (cherry picked from commit 505ffe56576caf67bedcb20d86a8c8a3e8e4c4b3) 9674ed71 Remove non-semantic use of `.row` in member listing controls
| * Merge branch 'docs/improve-installation-from-source' into 'master'Evan Read2019-05-141-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | Improve installation from source Closes #47483, #61549, and #50937 See merge request gitlab-org/gitlab-ce!28201 (cherry picked from commit 0a7216ab6eccf5607d5c526c1deea235f0f7462e) fe83b461 Improve installation from source ae123b49 Minor improvements for installation doc
| * Merge branch 'docs-update-salesforce-documentation' into 'master'Evan Read2019-05-141-4/+4
| | | | | | | | | | | | | | | | | | | | Docs: Fix wording error in salesforce section See merge request gitlab-org/gitlab-ce!28190 (cherry picked from commit 74511b049743cf543694bb92a8acd7e7586e533d) a0ecc3ed Fix wording error 268defdf Fix wording in salesforce docs
| * Merge branch ↵Evan Read2019-05-143-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '9228-geo-how-to-reconcile-differences-with-geo-checksum-mismatches-docs' into 'master' Document how to reconcile differences with Geo checksum mismatches Closes gitlab-ee#9228 See merge request gitlab-org/gitlab-ce!28183 (cherry picked from commit dbc0f8c1d3275b8c07102c68055e7c58c335ebb8) ecfadcfb Document how to reconcile differences with Geo checksum mismatches 8d3c42c3 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md 71757a82 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md e51488cb Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md 507cd1b9 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md 97a3f165 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md 450a3798 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md 65b98874 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md ea8e7bd8 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md 7473d40e Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md 6b269518 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md 6d4489e2 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md dcc949a4 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md 911fc185 Fix fenced code blocks
| * Merge branch 'qa-ml-fix-branches-test' into 'master'Sanad Liaquat2019-05-147-33/+34
|/ | | | | | | | | | | | Fix E2E test - wait for branches to not be present See merge request gitlab-org/gitlab-ce!27805 (cherry picked from commit 3061eee6ed00708225931bab566c20d91a06a5c0) f15f9970 Wait for branches to not be present a5af21cf Make max wait time a constant 99a4e973 Check test result via an assertion f00286bc Add branch_name qa selector
* Update VERSION to 11.11.0-rc2v11.11.0-rc2GitLab Release Tools Bot2019-05-081-1/+1
|
* Merge branch '11-11-stable-prepare-rc2' into '11-11-stable'Robert Speicher2019-05-081180-2942/+28051
|\ | | | | | | | | Prepare 11.11.0-rc2 release See merge request gitlab-org/gitlab-ce!28215
| * Merge branch 'rs-pre-freeze' into 11-11-stable-prepare-rc211-11-stable-prepare-rc2Robert Speicher2019-05-081180-2942/+28051
| |\ |/ /
| * Resolve conflicts from masterjl-remove-k8s-components-mermaid-docsJoshua Lambert2019-05-081-99/+65
| |
| * Merge branch 'docs-nneul/gitlab-ce-patch-1' into 'master'Achilleas Pipinellis2019-05-081-0/+16
| |\ | | | | | | | | | | | | | | | | | | Docs nneul/gitlab ce patch 1 Closes omnibus-gitlab#4132 See merge request gitlab-org/gitlab-ce!28182
| | * Docs nneul/gitlab ce patch 1Ian Baum2019-05-081-0/+16
| |/
| * Merge branch 'revert-0658ebf7' into 'master'Achilleas Pipinellis2019-05-081-5/+2
| |\ | | | | | | | | | | | | Revert "Merge branch 'fix-mermaid-chart-docs' into 'master'" See merge request gitlab-org/gitlab-ce!28193
| | * Revert "Merge branch 'fix-mermaid-chart-docs' into 'master'"revert-0658ebf7Stan Hu2019-05-071-5/+2
| | | | | | | | | This reverts merge request !28188
| * | Merge branch 'emilie-master-patch-81125' into 'master'Evan Read2019-05-071-0/+2
| |\ \ | | |/ | |/| | | | | | | Add info to docs about mapping a ping to the category it belongs to. See merge request gitlab-org/gitlab-ce!28189
| | * Add info to docs about mapping a ping to the category it belongs to.Emilie Schario2019-05-071-0/+2
| |/
| * Merge branch '53973-fix-subpixel-border-issue' into 'master'Fatih Acet2019-05-072-0/+10
| |\ | | | | | | | | | | | | | | | | | | Fix subpixel border issue on MR discussions Closes #53973 See merge request gitlab-org/gitlab-ce!28185