summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue-title-leakage-9-1' into 'security-9-1'Sean McGivern2017-07-194-49/+5
* Merge branch '24570-use-re2-for-user-supplied-regexp-9-1' into 'security-9-1'Douwe Maan2017-07-193-4/+61
* Merge branch '25934-project-snippet-vis' into 'security-9-2'Douwe Maan2017-06-029-11/+11
* Merge branch 'bvl-move-project-uploads-correctly' into 'security-9-2'Sean McGivern2017-06-021-1/+1
* Merge branch 'bvl-security-9-1-28917-contain-uploads-in-system-dir' into 'sec...Douwe Maan2017-05-311-1/+24
* Merge branch 'dz-api-x-frame' into 'security-9-2'Robert Speicher2017-05-311-0/+1
* Revert "Merge remote-tracking branch 'dev/security-9-1' into 9-1-stable"Timothy Andrew2017-05-302-25/+1
* Merge remote-tracking branch 'origin/9-1-stable' into security-9-1Timothy Andrew2017-05-2614-33/+99
|\
| * Merge branch 'fix/project-tree-saver-spec' into 'master'Rémy Coutable2017-05-121-0/+1
| * Merge branch 'fix/fork-spec-mysql' into 'master'Stan Hu2017-05-121-1/+3
| * Merge branch 'fix/import-export-missing-attributes' into 'master' Rémy Coutable2017-05-103-8/+31
| * Merge branch '31274-creating-schedule-trigger--causes-http-500-when-accessing...Rémy Coutable2017-05-101-2/+17
| * Merge branch 'dont-blow-up-when-email-has-no-references-header' into 'master' Douwe Maan2017-05-101-0/+2
| * Merge branch '30973-network-graph-sorted-by-date-and-topo' into 'master'Douwe Maan2017-05-101-7/+22
| * Merge branch '2247-emails-forwarded-to-service-desk-email-don-t-come' into 'm...Sean McGivern2017-05-101-5/+11
| * Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-042-2/+2
| * Fix test errorLin Jen-Shin2017-05-041-1/+1
| * Merge branch 'snippets-finder-visibility' into 'security' Douwe Maan2017-05-044-8/+6
| * Merge branch '31157-respect-project-features-in-wiki-search' into 'security' Douwe Maan2017-05-041-0/+4
| * Merge branch 'bvl-security-9-1-markup-pipeline' into 'security-9-1'Robert Speicher2017-05-043-7/+18
| * Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri' into 'sec...Robert Speicher2017-05-041-18/+18
* | Merge branch 'dz-api-x-frame' into 'security-9-2'Robert Speicher2017-05-261-0/+1
* | Upload all files in `uploads/system`Bob Van Landuyt2017-05-241-1/+24
* | Validate URLs using URIBob Van Landuyt2017-05-021-18/+18
* | Render asciidoc & other markup using banzai in a pipelineBob Van Landuyt2017-05-013-7/+18
|/
* Merge branch 'fix/github-importer' into 'master' Sean McGivern2017-04-2820-90/+916
* Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-281-6/+17
* Merge branch '31280-skip-issueables-without-project' into 'master' Sean McGivern2017-04-261-1/+5
* Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabledrc/dm-fix-oauth-user-creation-9-1-stableDouwe Maan2017-04-251-1/+1
* Merge branch 'fix/encoding-issue' into 'master' Sean McGivern2017-04-211-1/+7
* Merge branch 'fix-jobs-enabled-parameter' into 'master'Sean McGivern2017-04-211-2/+5
* Merge branch 'add-email-receiver-metrics' into 'master' Douwe Maan2017-04-213-4/+8
* Merge branch 'usage-ping-port' into 'master'Sean McGivern2017-04-207-1/+130
* Merge branch 'issuable-state-custom-links' into 'master' Sean McGivern2017-04-201-2/+2
* Merge branch 'plantuml-filter-after-highlight' into 'master' Sean McGivern2017-04-201-4/+4
* Merge branch 'issuable-state-only-notes-and-description' into 'master' Sean McGivern2017-04-201-0/+2
* Merge branch 'fix/gb/container-registry-repository-paths' into 'master' Kamil Trzciński2017-04-191-2/+8
* Merge branch 'fix/improve-gitaly-unsupported-address-error' into 'master' Robert Speicher2017-04-191-1/+1
* Merge branch '30696-long-build-log-improvement' into 'master' Phil Hughes2017-04-191-1/+1
* Merge branch 'enforce-Ansi2html-output-encoding' into 'master' Kamil Trzciński2017-04-182-11/+4
* Merge branch 'fix/30961' into 'master' Robert Speicher2017-04-181-1/+0
* Merge branch 'fix-trace-encoding' into 'master' Sean McGivern2017-04-171-2/+9
* Merge branch 'sh-fix-base-parser' into 'master' Robert Speicher2017-04-171-1/+2
* Merge branch 'fix-appending-state-to-issuable-references' into 'master' Robert Speicher2017-04-141-2/+2
* Merge branch 'zero-downtime-migrations' into 'master' Douwe Maan2017-04-142-1/+293
* Merge branch 'fix/gb/fix-registry-for-uppercased-project-paths' into 'master' Kamil Trzciński2017-04-131-2/+2
* Merge branch 'fix-trace-seeking-readline' into 'master' Kamil Trzciński2017-04-131-4/+3
* Merge branch 'backport-ee-1525' into 'master' Robert Speicher2017-04-138-57/+91
* Merge branch 'zj-api-fix-build-events' into 'master' Rémy Coutable2017-04-131-3/+9
* Merge branch 'zj-fix-coverage-bug' into 'master' Kamil Trzciński2017-04-131-1/+4