summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Fix connection to Tiller error while uninstalling62713-fix-uninstalling-cluster-appsThong Kuah2019-06-051-0/+1
* Ignore Puma empty worker statsJan Provaznik2019-06-041-1/+2
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-06-032-1/+14
|\
| * Merge branch 'security-60143-address-xss-issue-master' into 'master'Robert Speicher2019-06-031-0/+8
| |\
| | * Reject slug+uri concat if slug is deemed unsafeKerri Miller2019-05-241-0/+8
| * | 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 branch 'osw-sync-merge-ref-upon-mergeability-check' into 'master'Douwe Maan2019-06-032-19/+7
|\ \ \ \
| * | | | Add payload to the service responseOswaldo Ferreira2019-05-311-2/+2
| * | | | Simplify merge_ref_head methodsOswaldo Ferreira2019-05-311-2/+2
| * | | | Automatically update MR merge-ref along merge statusOswaldo Ferreira2019-05-312-19/+7
* | | | | Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-06-039-29/+145
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
| * | | | | | | Merge branch 'dm-http-hostname-override' into 'master'GitLab Release Tools Bot2019-06-034-22/+84
| |\ \ \ \ \ \ \
| | * | | | | | | Add DNS rebinding protection settingsOswaldo Ferreira2019-05-303-11/+37
| | * | | | | | | Protect Gitlab::HTTP against DNS rebinding attackDouwe Maan2019-05-303-22/+58
| * | | | | | | | Merge branch 'security-fix-project-existence-disclosure-master' into 'master'GitLab Release Tools Bot2019-06-031-2/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fix url redaction for issue linksPatrick Derichs2019-05-031-2/+5
* | | | | | | | | 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 'abstract-auto-merge' into 'master'Kamil Trzciński2019-06-031-7/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Abstract auto merge processesShinya Maeda2019-06-031-7/+4
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | 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
* | | | | | | | | Add optional param :start_project to allow variable commit targetsKerri Miller2019-05-311-0/+10
* | | | | | | | | Merge branch 'gitaly-version-v1.43.0' into 'master'Bob Van Landuyt2019-05-312-40/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove hook directory requirement from Shellgitaly-version-v1.43.0Zeger-Jan van de Weg2019-05-302-40/+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
| * | | | | | | | | | Call analyzers from LoggerAnalyzercharlieablett2019-05-301-19/+9
| * | | | | | | | | | Add GraphQL logging feature flagcharlieablett2019-05-301-1/+1
| * | | | | | | | | | Restructure complexity analyzercharlieablett2019-05-301-16/+24
| * | | | | | | | | | Implement logger analyzercharlieablett2019-05-303-29/+66
| * | | | | | | | | | New logfile for graphql queriescharlieablett2019-05-302-1/+20