summaryrefslogtreecommitdiff
path: root/lib/banzai
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue-63298-asciidoc-sanitization' into 'master'Douwe Maan2019-07-124-79/+163
|\
| * Prevent excessive sanitization of AsciiDoc ouptutGuillaume Grossetie2019-07-124-79/+163
* | Merge branch 'banzai-avoid-redis-if-db-cache' into 'master'Douwe Maan2019-07-111-11/+31
|\ \
| * | Banzai - avoid redis if attr is in DB cachebanzai-avoid-redis-if-db-cacheMario de la Ossa2019-07-101-11/+31
| |/
* | Expose metrics element for FE consumptionSarah Yasonik2019-07-105-0/+210
|/
* Merge branch 'asciidoc-syntax-highlighting' into 'master'Douwe Maan2019-07-032-1/+2
|\
| * Enable AsciiDoc syntax highlighting (using Rouge)Guillaume Grossetie2019-07-022-1/+2
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2019-07-031-3/+3
|\ \ | |/
| * Fix attachments using the wrong URLs in e-mailssh-fix-issue-63910Stan Hu2019-06-281-3/+3
* | Merge branch 'security-DOS_issue_comments_banzai' into 'master'Marin Jankovski2019-07-021-1/+1
|\ \ | |/ |/|
| * Fix DOS when rendering issue/MR commentsMario de la Ossa2019-06-131-1/+1
* | Do not rewrite relative links for system notesbug/63162-duplicate_path_in_linksMario de la Ossa2019-06-201-0/+2
|/
* Allow emoji in label and milestone referencesallow-emoji-in-referencesSean McGivern2019-06-071-1/+1
* Use Redis for CacheMarkDownField on non AR modelsPatrick Bajao2019-06-051-1/+1
* 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-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
* | Fix milestone references with HTML entities in the namefix-milestone-references-with-escaped-html-entitiesSean McGivern2019-05-243-10/+10
* | Merge branch 'patch-49' into 'master'Sean McGivern2019-05-061-0/+1
|\ \
| * | Use strip to remove leading/trailing spacesWillian Balmant2019-04-111-2/+1
| * | No leading/trailing spaces when generating heading ids (Fixes #57528)Willian Balmant2019-04-101-2/+2
| * | No leading/trailing spaces when generating heading ids (Fixes #57528)Willian Balmant2019-04-041-0/+2
* | | Run rubocop -a on CE filessh-upgrade-rubocop-0.68.0-ceStan Hu2019-05-055-14/+14
| |/ |/|
* | Move scoped_label into label presenterJan Provaznik2019-04-231-2/+4
* | Remove multi-line suggestions feature flagosw-remote-multi-line-suggestions-ffOswaldo Ferreira2019-04-101-12/+0
* | Merge branch 'docs-zj-update-n-plus-one-comments' into 'master'Douglas Barbosa Alexandre2019-04-091-1/+1
|\ \
| * | Update comments about N + 1 Gitaly callsZeger-Jan van de Weg2019-04-091-1/+1
* | | [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requestsOswaldo Ferreira2019-04-081-1/+1
|/ /
* | Merge branch 'keyval-labels' into 'master'Sean McGivern2019-04-052-4/+14
|\ \
| * | [backend] backport of scoped labelsJan Provaznik2019-04-042-4/+14
* | | Fenced blockquotes to not change source line pos58717-checkbox-cannot-be-checked-if-a-blockquote-is-aboveBrett Walker2019-04-041-1/+3
| |/ |/|
* | Fixed test specsOswaldo Ferreira2019-04-041-16/+0
|/
* Prepare suggestion implementation for multi-lineOswaldo Ferreira2019-03-271-0/+2
* Merge branch '54916-extended-tooltip-for-merge-request-links' into 'master'Phil Hughes2019-03-262-6/+17
|\
| * Add merge request popover with detailsSam Bigelow2019-03-212-6/+17
* | Implement multi-line suggestions filteringOswaldo Ferreira2019-03-204-6/+49
|/
* Add SyntaxHighlightFilter to markup pipelineMartin Wortschack2019-03-051-1/+2
* Only allow 30 RPCs per test case to GitalyZeger-Jan van de Weg2019-02-221-1/+4
* Properly handle multiple refs to same footnoteBrett Walker2019-02-131-7/+16
* Merge branch 'jprovazn-remove-redcarpet' into 'master'Grzegorz Bizon2019-02-054-54/+0
|\
| * Remove Redcarpet markdown engineJan Provaznik2019-02-044-54/+0
* | Catch possible Addressable::URI::InvalidURIErrorBrett Walker2019-02-041-1/+5
|/
* Show tooltip for malicious looking linksBrett Walker2019-01-313-11/+88
* Merge branch 'bw-enable-sourcepos' into 'master'Robert Speicher2019-01-289-7/+36
|\
| * Fix review commentsBrett Walker2019-01-215-3/+17
| * Enable CommonMark source line position informationBrett Walker2019-01-216-6/+21
* | Allow suggestions to be copied and pasted as GFMDouwe Maan2019-01-251-0/+1
* | Merge branch 'db-copy-as-gfm-prosemirror' into 'master'Phil Hughes2019-01-2512-5/+21
|\ \
| * | Use nodes and marks to power Copy-as-GFMdb-copy-as-gfm-prosemirrorDouwe Maan2019-01-2412-5/+21
| |/