summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add client code to call GetObjectDirectorySize RPCpb-quarantine-size-check-11-10-cePatrick Bajao2019-06-257-4/+39
* Update VERSION to 11.10.6v11.10.6GitLab Release Tools Bot2019-06-041-1/+1
* Update CHANGELOG.md for 11.10.6GitLab Release Tools Bot2019-06-049-40/+17
* Merge branch '11-10-stable-patch-6' into '11-10-stable'John Jarvis2019-06-0431-14/+159
|\
| * Merge branch 'sh-fix-related-merge-requests-path' into 'master'11-10-stable-patch-6Rémy Coutable2019-06-034-1/+44
| * Merge branch 'use-source-ref-name-in-webhook' into 'master'Ash McKenzie2019-06-033-1/+15
| * Merge branch '60778-input-text-height' into 'master'Filipa Lacerda2019-06-033-0/+10
| * Merge branch 'sh-fix-rugged-get-tree-entries-recursive' into 'master'Douglas Barbosa Alexandre2019-06-033-1/+10
| * Merge branch 'fix-project-visibility-level-validation' into 'master'Stan Hu2019-06-033-2/+18
| * Merge branch 'sh-revert-full-gc-after-import' into 'master'Rémy Coutable2019-06-032-2/+2
| * Merge branch 'ce-11099-removing-the-project-that-holds-the-insights-configura...Robert Speicher2019-06-031-0/+6
| * Merge branch '61203-fix-lfs-ui-upload' into 'master'Nick Thomas2019-06-033-1/+32
| * Merge branch 'sh-allow-equal-level-in-subgroup-membership' into 'master'James Lopez2019-06-036-5/+20
| * Merge branch 'sh-11-10-upgrade-chrome-v73' into '11-10-stable-patch-6'John Jarvis2019-06-033-2/+9
| |\
| | * Upgrade CI to use Chrome V73sh-11-10-upgrade-chrome-v73Stan Hu2019-04-291-2/+2
| | * Fix search dropdown being hidden immediatelyHeinrich Lee Yu2019-04-291-0/+2
| | * Gracefully handle undefined data in getTreeEntries()Stan Hu2019-04-291-0/+5
| * | Merge branch 'sh-gitaly-update-for-11-10' into '11-10-stable-patch-6'John Jarvis2019-06-032-1/+6
| |\ \
| | * | Use 3-way merge for squashing commitssh-gitaly-update-for-11-10Stan Hu2019-05-032-1/+6
* | | | Update VERSION to 11.10.5v11.10.511-10-stable-prepare-rc6GitLab Release Tools Bot2019-05-301-1/+1
* | | | Update CHANGELOG.md for 11.10.5GitLab Release Tools Bot2019-05-3013-60/+18
* | | | Merge branch 'osw-disable-dns-rebind-protection-settings-11-10' into '11-10-s...GitLab Release Tools Bot2019-05-3014-13/+184
|\ \ \ \
| * | | | Rename UrlBlocker argument: schemes -> protocolsStan Hu2019-05-291-1/+1
| * | | | Use Rails migration v5.0 for GitLab 11.10Stan Hu2019-05-291-1/+1
| * | | | Add changelogOswaldo Ferreira2019-05-291-0/+5
| * | | | Add DNS rebinding protection settingsOswaldo Ferreira2019-05-2913-13/+179
|/ / / /
* | | | Merge branch 'security-60143-address-xss-issue-11.10' into '11-10-stable'GitLab Release Tools Bot2019-05-283-0/+55
|\ \ \ \
| * | | | Reject slug+uri concat if slug is deemed unsafeKerri Miller2019-05-273-0/+55
| |/ / /
* | | | Merge branch 'security-58856-persistent-xss-11-10' into '11-10-stable'GitLab Release Tools Bot2019-05-286-3/+41
|\ \ \ \
| * | | | Change `prohibited_key` to use regexescharlieablett2019-05-011-4/+2
| * | | | Add `html` to sensitive wordscharlieablett2019-05-013-2/+4
| * | | | Add changelog entrycharlieablett2019-04-301-0/+5
| * | | | Ensure Issue & MR note_html cannot be importedAsh McKenzie2019-04-302-14/+16
| * | | | Add newline to AttributeCleanercharlieablett2019-04-301-1/+1
| * | | | Refactor AttributeCleaner` for readabilitycharlieablett2019-04-301-2/+3
| * | | | Refactor AttributeCleaner` for readabilitycharlieablett2019-04-301-7/+2
| * | | | Tighten up prohibited_key methodcharlieablett2019-04-261-4/+3
| * | | | Add disallowed fields to AttributeCleanercharlieablett2019-04-243-2/+38
* | | | | Merge branch 'security-fix-project-existence-disclosure-11-10' into '11-10-st...GitLab Release Tools Bot2019-05-283-16/+28
|\ \ \ \ \
| * | | | | Fix url redaction for issue linksPatrick Derichs2019-05-063-16/+28
| | |_|/ / | |/| | |
* | | | | Merge branch 'security-60039-11-10' into '11-10-stable'GitLab Release Tools Bot2019-05-288-33/+144
|\ \ \ \ \
| * | | | | Validate MR branch namesMark Chao2019-05-068-33/+144
| |/ / / /
* | | | | Merge branch 'security-unsubscribing-from-issue-11-10' into '11-10-stable'GitLab Release Tools Bot2019-05-284-11/+111
|\ \ \ \ \
| * | | | | Hide issue title on unsubscribe for anonymous usersAlexandru Croitor2019-05-204-11/+111
| |/ / / /
* | | | | Merge branch 'security-fix-confidential-issue-label-visibility-11-10' into '1...GitLab Release Tools Bot2019-05-283-1/+40
|\ \ \ \ \
| * | | | | Fix confidential issue label disclosure on milestone viewPatrick Derichs2019-05-193-1/+40
| |/ / / /
* | | | | Merge branch 'security-fix_milestones_search_api_leak-11-10' into '11-10-stable'GitLab Release Tools Bot2019-05-287-6/+130
|\ \ \ \ \
| * | | | | Resolve: Milestones leaked via search APIFelipe Artur2019-05-217-6/+130
| |/ / / /
* | | | | Merge branch 'security-http-hostname-override-11-10' into '11-10-stable'GitLab Release Tools Bot2019-05-2828-87/+412
|\ \ \ \ \
| * | | | | Protect Gitlab::HTTP against DNS rebinding attackDouwe Maan2019-05-2228-87/+412
| |/ / / /
View Lorry Controller Status