summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue-title-leakage-9-1' into 'security-9-1'Sean McGivern2017-07-199-66/+52
* Merge branch '24570-use-re2-for-user-supplied-regexp-9-1' into 'security-9-1'Douwe Maan2017-07-194-0/+108
* Merge branch '33303-9-1-security-fix' into 'security-9-1'Sean McGivern2017-07-191-0/+30
* Merge branch 'bvl-security-9-1-remove-appearance-symlink' into 'security-9-1'Douwe Maan2017-07-191-0/+46
* Merge branch 'security-9-1-backport-33323-fix-incorrect-project-authorization...Sean McGivern2017-07-192-0/+53
* Add the `with_avatar` trait to projects factoryBob Van Landuyt2017-06-021-0/+4
* Merge branch '25934-project-snippet-vis' into 'security-9-2'Douwe Maan2017-06-023-8/+187
* Merge branch 'bvl-move-project-uploads-correctly' into 'security-9-2'Sean McGivern2017-06-022-1/+12
* Merge branch 'dz-restrict-autocomplete' into 'security-9-1' Robert Speicher2017-05-311-10/+20
* Merge branch 'bvl-security-9-1-28917-contain-uploads-in-system-dir' into 'sec...Douwe Maan2017-05-3121-32/+503
* Revert "Merge remote-tracking branch 'dev/security-9-1' into 9-1-stable"Timothy Andrew2017-05-3022-523/+42
* Merge remote-tracking branch 'origin/9-1-stable' into security-9-1Timothy Andrew2017-05-2641-350/+1551
|\
| * Merge branch 'fix/project-tree-saver-spec' into 'master'Rémy Coutable2017-05-121-2/+2
| * Merge branch '31978-cross-reference-fix' into 'master' Sean McGivern2017-05-121-0/+77
| * Merge branch 'fallback-localstorage-cases' into 'master'9-1-stable-cherry-pick-fallback-localstorage-casesPhil Hughes2017-05-109-3/+544
| * Merge branch 'fix/import-export-missing-attributes' into 'master' Rémy Coutable2017-05-108-6/+63
| * Merge branch '31274-creating-schedule-trigger--causes-http-500-when-accessing...Rémy Coutable2017-05-103-9/+129
| * Merge branch 'dont-blow-up-when-email-has-no-references-header' into 'master' Douwe Maan2017-05-101-1/+9
| * Merge branch '30973-network-graph-sorted-by-date-and-topo' into 'master'Douwe Maan2017-05-102-4/+19
| * Merge branch '2247-emails-forwarded-to-service-desk-email-don-t-come' into 'm...Sean McGivern2017-05-102-0/+43
| * Merge branch 'fix-search-not-highlighting' into 'master'Filipa Lacerda2017-05-101-4/+24
| * Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-042-11/+81
| * Fix the other failureLin Jen-Shin2017-05-041-1/+1
| * Fix test failureLin Jen-Shin2017-05-041-1/+1
| * Merge branch 'fix-hamlit-xss' into 'security-9-1' Robert Speicher2017-05-041-0/+22
| * Merge branch 'snippets-finder-visibility' into 'security' Douwe Maan2017-05-048-97/+310
| * Merge branch 'branch-name-escape' into 'security'Robert Speicher2017-05-041-6/+14
| * Merge branch '31157-respect-project-features-in-wiki-search' into 'security' Douwe Maan2017-05-041-3/+72
| * Merge branch 'snippets_visibility' into 'security' Sean McGivern2017-05-042-206/+148
| * Merge branch 'droplab-templating-xss-fix' into 'master'Jacob Schatz2017-05-042-2/+8
| * Merge branch 'rs-sanitize-submodule-urls' into 'security' Douwe Maan2017-05-041-0/+12
| * Merge branch 'bvl-security-9-1-markup-pipeline' into 'security-9-1'Robert Speicher2017-05-043-25/+30
| * Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri' into 'sec...Robert Speicher2017-05-042-38/+57
* | Don't rename routes that start with `system`Bob Van Landuyt2017-05-241-0/+10
* | Upload all files in `uploads/system`Bob Van Landuyt2017-05-2421-32/+493
* | Allow users autocomplete by author_id only for authenticated usersDmitriy Zaporozhets2017-05-061-10/+20
* | Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri' into 'sec...Robert Speicher2017-05-023-39/+50
|\ \
| * | Validate URLs using URIBob Van Landuyt2017-05-023-39/+50
* | | Merge branch 'fix-hamlit-xss' into 'security-9-1' Robert Speicher2017-05-021-0/+22
|\ \ \ | |/ / |/| |
| * | Add view specBrian Neel2017-05-011-0/+22
| |/
* | Render asciidoc & other markup using banzai in a pipelineBob Van Landuyt2017-05-013-25/+38
|/
* Merge branch 'fix-sidebar-block-ref-test' into 'master' Sean McGivern2017-04-281-3/+2
* Merge branch 'dm-fix-ghost-user-validation' into 'master' Robert Speicher2017-04-281-0/+10
* Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-282-0/+50
* Merge branch '31292-milestone-sidebar-display-incorect-number-of-mr-when-mini...Sean McGivern2017-04-281-0/+24
* Merge branch '2246-uuid-is-nil-for-new-installation' into 'master'Sean McGivern2017-04-281-0/+1
* Merge branch '31294-fix-oauth-users-do-not-need-to-be-confirmed' into '9-1-st...Sean McGivern2017-04-263-0/+41
|\
| * Ensures that OAuth/LDAP/SAML users don't need to be confirmedRémy Coutable2017-04-263-0/+41
* | Merge branch '31280-skip-issueables-without-project' into 'master' Sean McGivern2017-04-262-25/+56
|/
* Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabledrc/dm-fix-oauth-user-creation-9-1-stableDouwe Maan2017-04-253-0/+38
View Lorry Controller Status