summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '54140-non-ar-cache-commit-markdown' into 'master'Douwe Maan2019-06-057-12/+372
|\
| * Remove requirement for id for #markdown_cache_keyPatrick Bajao2019-06-052-8/+0
| * Use #cache_key of subject for generated redis keyPatrick Bajao2019-06-053-27/+37
| * Use Redis for CacheMarkDownField on non AR modelsPatrick Bajao2019-06-057-12/+370
* | Merge branch 'graphql-file-entry-url' into 'master'Nick Thomas2019-06-051-0/+20
|\ \
| * | Add web_url to tree entry in GraphQL APIPhil Hughes2019-06-051-0/+20
| |/
* | Merge branch '11126-fix-repository-size-check-ce' into 'master'Stan Hu2019-06-052-0/+23
|\ \
| * | Add client code to call GetObjectDirectorySize RPC11126-fix-repository-size-check-cePatrick Bajao2019-06-052-0/+23
| |/
* | Merge branch '62713-fix-uninstalling-cluster-apps' into 'master'Douglas Barbosa Alexandre2019-06-051-0/+24
|\ \
| * | Fix connection to Tiller error while uninstalling62713-fix-uninstalling-cluster-appsThong Kuah2019-06-051-0/+24
* | | Add multiple extends supportWolphin2019-06-053-11/+39
| |/ |/|
* | Merge branch '61964-unicorn-instrumentation' into 'master'Bob Van Landuyt2019-06-043-8/+71
|\ \ | |/ |/|
| * Merge branch 'master' into 61964-unicorn-instrumentationRyan Cobb2019-05-2912-83/+313
| |\
| * | Adds ruby and unicorn instrumentationRyan Cobb2019-05-203-8/+71
* | | Ignore Puma empty worker statsJan Provaznik2019-06-041-0/+27
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-06-034-1/+71
|\ \ \
| * \ \ Merge branch 'security-60143-address-xss-issue-master' into 'master'Robert Speicher2019-06-031-0/+42
| |\ \ \
| | * | | Reject slug+uri concat if slug is deemed unsafeKerri Miller2019-05-241-0/+42
| * | | | Merge branch 'security-58856-persistent-xss-in-note-objects' into 'master'Robert Speicher2019-06-033-1/+29
| |\ \ \ \
| | * | | | Remove unused fixture linesTiger2019-05-281-2/+0
| | * | | | Add `html` to sensitive wordscharlieablett2019-05-011-1/+2
| | * | | | Remove accidental regressionscharlieablett2019-04-301-5/+6
| | * | | | Ensure Issue & MR note_html cannot be importedAsh McKenzie2019-04-302-16/+16
| | * | | | Add disallowed fields to AttributeCleanercharlieablett2019-04-242-10/+8
| | * | | | Re-stub stubbed method callscharlieablett2019-04-231-3/+9
| | * | | | Exclude fields from note importcharlieablett2019-04-232-2/+26
* | | | | | Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-06-0316-64/+438
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'security-fix_milestones_search_api_leak' into 'master'GitLab Release Tools Bot2019-06-031-0/+24
| |\ \ \ \ \
| | * | | | | Resolve: Milestones leaked via search APIFelipe Artur2019-05-201-0/+24
| * | | | | | Merge branch 'security-60039' into 'master'GitLab Release Tools Bot2019-06-032-27/+66
| |\ \ \ \ \ \
| | * | | | | | Refactor spec to not use truthy or falseyMark Chao2019-05-031-58/+58
| | * | | | | | Validate MR branch namesMark Chao2019-05-032-27/+66
| * | | | | | | Merge branch 'security-id-leaked-password-in-import-url-frontend' into 'master'GitLab Release Tools Bot2019-06-031-0/+34
| |\ \ \ \ \ \ \
| | * | | | | | | Hide password on import by url formIgor Drozdov2019-05-291-0/+34
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'dm-http-hostname-override' into 'master'GitLab Release Tools Bot2019-06-0311-23/+296
| |\ \ \ \ \ \ \
| | * | | | | | | Add DNS rebinding protection settingsOswaldo Ferreira2019-05-303-0/+97
| | * | | | | | | Protect Gitlab::HTTP against DNS rebinding attackDouwe Maan2019-05-3010-23/+199
| * | | | | | | | Merge branch 'security-fix-project-existence-disclosure-master' into 'master'GitLab Release Tools Bot2019-06-031-14/+18
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fix url redaction for issue linksPatrick Derichs2019-05-031-14/+18
* | | | | | | | | Merge branch 'ac-graphql-stats' into 'master'Dmitriy Zaporozhets2019-06-031-0/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add Namespace and ProjectStatistics to GraphQL APIAlessio Caiazza2019-06-031-0/+18
* | | | | | | | | | Fix port validations in .gitlab-webide.ymlce-fj-11886-fix-port-validationFrancisco Javier López2019-06-011-0/+10
|/ / / / / / / / /
* | | | | | | | | Merge branch 'osw-reset-merge-status-from-mergeable-mrs' into 'master'Douglas Barbosa Alexandre2019-05-311-0/+48
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Reset merge status from mergeable MRsOswaldo Ferreira2019-05-311-0/+48
* | | | | | | | | | Merge branch 'dz-scope-project-routes-3' into 'master'Lin Jen-Shin2019-05-311-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix specs after routing changeDmitriy Zaporozhets2019-05-291-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'gitaly-version-v1.43.0' into 'master'Bob Van Landuyt2019-05-313-68/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove hook directory requirement from Shellgitaly-version-v1.43.0Zeger-Jan van de Weg2019-05-303-68/+0
* | | | | | | | | | | Merge branch '59587-add-graphql-logging' into 'master'Sean McGivern2019-05-312-0/+65
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Apply reviewer feedback59587-add-graphql-loggingcharlie ablett2019-05-312-14/+9