summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Cleanup #attributes method54140-non-ar-cache-commit-markdownPatrick Bajao2019-06-051-20/+14
* Remove requirement for id for #markdown_cache_keyPatrick Bajao2019-06-051-2/+2
* Use #cache_key of subject for generated redis keyPatrick Bajao2019-06-051-1/+1
* Use Redis for CacheMarkDownField on non AR modelsPatrick Bajao2019-06-055-0/+221
* Merge branch '61964-unicorn-instrumentation' into 'master'Bob Van Landuyt2019-06-043-21/+74
|\
| * Add comment to clarify system proc stat field61964-unicorn-instrumentationRyan Cobb2019-06-041-0/+2
| * Remove unnecessary super call in unicorn samplerRyan Cobb2019-06-031-4/+0
| * Merge branch 'master' into 61964-unicorn-instrumentationRyan Cobb2019-05-2921-110/+203
| |\
| * | Fix typo in system.rbRyan Cobb2019-05-201-1/+1
| * | Adds ruby and unicorn instrumentationRyan Cobb2019-05-203-17/+72
* | | Merge branch 'bump-auto-devops-helm-2-14-0' into 'master'Mayra Cabrera2019-06-041-2/+2
|\ \ \
| * | | Bump Helm version in Auto-DevOps.gitlab-ci.ymlbump-auto-devops-helm-2-14-0Thong Kuah2019-06-041-2/+2
* | | | Merge branch 'trizzi-master-patch-86505' into 'master'Dmitriy Zaporozhets2019-06-041-59/+15
|\ \ \ \
| * | | | Clarify error message and image in ymltrizzi-master-patch-86505Tim Rizzi2019-06-031-3/+4
| * | | | Update yml file comments re: deployTim Rizzi2019-05-301-4/+4
| * | | | Update instructions and uncomment out deployTim Rizzi2019-05-301-13/+13
| * | | | Simplify deploy script and comment out for CETim Rizzi2019-05-301-11/+16
| * | | | Update maven.gitlab-ci.yml for GitLab PackageTim Rizzi2019-05-271-59/+9
* | | | | Ignore Puma empty worker statsJan Provaznik2019-06-041-1/+2
| |/ / / |/| | |
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-06-031-1/+6
|\ \ \ \
| * \ \ \ Merge branch 'security-58856-persistent-xss-in-note-objects' into 'master'Robert Speicher2019-06-031-1/+6
| |\ \ \ \
| | * | | | Change `prohibited_key` to use regexescharlieablett2019-05-011-4/+2
| | * | | | Add `html` to sensitive wordscharlieablett2019-05-011-1/+1
| | * | | | Refactor `attribute_cleaner` for readabilitycharlieablett2019-04-301-1/+3
| | * | | | Further clarify `attribute_cleaner`charlieablett2019-04-291-10/+4
| | * | | | Tighten up prohibited_key methodcharlieablett2019-04-261-3/+2
| | * | | | Use English instead of LatinCharlie Ablett2019-04-251-2/+2
| | * | | | Add disallowed fields to AttributeCleanercharlieablett2019-04-242-4/+13
| | * | | | Exclude fields from note importcharlieablett2019-04-231-0/+3
* | | | | | Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-06-037-27/+135
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'security-fix_milestones_search_api_leak' into 'master'GitLab Release Tools Bot2019-06-032-3/+31
| |\ \ \ \ \
| | * | | | | Resolve: Milestones leaked via search APIFelipe Artur2019-05-202-3/+31
| * | | | | | Merge branch 'security-60039' into 'master'GitLab Release Tools Bot2019-06-031-2/+21
| |\ \ \ \ \ \
| | * | | | | | Validate MR branch namesMark Chao2019-05-031-2/+21
| * | | | | | | Merge branch 'security-id-leaked-password-in-import-url-frontend' into 'master'GitLab Release Tools Bot2019-06-031-0/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Hide password on import by url formIgor Drozdov2019-05-291-0/+4
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Add DNS rebinding protection settingsOswaldo Ferreira2019-05-302-11/+32
| * | | | | | | Protect Gitlab::HTTP against DNS rebinding attackDouwe Maan2019-05-303-22/+58
* | | | | | | | Merge branch 'ac-graphql-stats' into 'master'Dmitriy Zaporozhets2019-06-031-0/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Add Namespace and ProjectStatistics to GraphQL APIAlessio Caiazza2019-06-031-0/+23
* | | | | | | | | Merge branch 'ce-fj-11886-fix-port-validation' into 'master'Kamil Trzciński2019-06-032-1/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix port validations in .gitlab-webide.ymlce-fj-11886-fix-port-validationFrancisco Javier López2019-06-012-1/+4
* | | | | | | | | Remove delta island feature flagZeger-Jan van de Weg2019-06-031-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'osw-reset-merge-status-from-mergeable-mrs' into 'master'Douglas Barbosa Alexandre2019-05-311-0/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Reset merge status from mergeable MRsOswaldo Ferreira2019-05-311-0/+17
* | | | | | | | | Merge branch 'gitaly-version-v1.43.0' into 'master'Bob Van Landuyt2019-05-311-28/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove hook directory requirement from Shellgitaly-version-v1.43.0Zeger-Jan van de Weg2019-05-301-28/+0
* | | | | | | | | | Merge branch '59587-add-graphql-logging' into 'master'Sean McGivern2019-05-313-18/+80
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Apply reviewer feedback59587-add-graphql-loggingcharlie ablett2019-05-311-21/+27
| * | | | | | | | | | Move complexity/depth to `final_value`charlieablett2019-05-301-9/+11