summaryrefslogtreecommitdiff
path: root/lib/banzai
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'markdown-plantuml' into 'master' Sean McGivern2017-02-032-0/+40
|\ | | | | | | | | | | | | PlantUML support for Markdown Closes #4048 See merge request !8588
| * PlantUML support for MarkdownHoracio Sanson2017-02-032-0/+40
| | | | | | | | | | | | | | | | | | | | | | Allow rendering of PlantUML diagrams in Markdown documents using fenced blocks: ```plantuml Bob -> Sara : Hello Sara -> Bob : Go away ``` Closes: #4048
* | replace `find_with_namespace` with `find_by_full_path`Adam Pahlevi2017-02-031-1/+1
|/ | | | add complete changelog for !8949
* Merge branch 'master' into copy-as-mdDouwe Maan2017-01-253-4/+8
|\ | | | | | | | | # Conflicts: # app/assets/javascripts/lib/utils/common_utils.js.es6
| * address commentsJarka Kadlecova2017-01-251-0/+1
| |
| * make mentions working when project not specifiedJarka Kadlecova2017-01-183-5/+8
| |
* | Merge branch 'master' into copy-as-mdDouwe Maan2017-01-191-3/+5
|\ \ | |/ | | | | | | # Conflicts: # app/assets/javascripts/lib/utils/common_utils.js.es6
| * Correct documentation for `data_attribute` methodrs-data_attribute-cleanupRobert Speicher2017-01-161-3/+5
| | | | | | | | Also break up a long line, just 'cause.
* | Add more SyntaxHighlightFilter and MathFilter testsDouwe Maan2017-01-171-2/+4
| |
* | Fix SyntaxHighlightFilter specDouwe Maan2017-01-171-0/+1
| |
* | Improve specDouwe Maan2017-01-161-3/+4
| |
* | Copying a rendered issue/comment will paste into GFM textareas as actual GFMDouwe Maan2017-01-165-6/+12
|/
* Merge branch 'inline-math-dollar' into 'master' Robert Speicher2016-12-221-8/+3
|\ | | | | | | | | Don't render inline math when dollar signs are inside markup See merge request !8259
| * Don't render inline math when dollar signs are inside markupinline-math-dollarDouwe Maan2016-12-221-8/+3
| |
* | Use `ref` variable24224-fix-project-ref-cacheDouwe Maan2016-12-221-1/+1
| |
* | Fix lookup of project by unknown ref when caching is enabledDouwe Maan2016-12-221-4/+15
|/
* Filter protocol-relative URLs in ExternalLinkFilter. Fixes issue #22742.Makoto Scott-Hinkle2016-12-211-1/+1
|
* Merge branch 'katex-math' into 'master' Sean McGivern2016-12-152-0/+52
|\ | | | | | | | | | | | | Render math in Asciidoc and Markdown with KaTeX using code blocks Closes #13690 and #13180 See merge request !8003
| * Render math in Asciidoc and Markdown with KaTeX using code blocksMunken2016-12-144-31/+52
| |
| * Better location for math lexerMunken2016-12-081-22/+0
| |
| * Removed alias and filenamesMunken2016-12-081-2/+0
| |
| * Hacked in Math LexerMunken2016-12-081-0/+27
| |
| * Math works for inline syntaxMunken2016-12-081-2/+0
| |
| * Working inline math filterMunken2016-12-082-0/+30
| |
* | Merge branch 'dz-nested-group-improvements-2' into 'master' Sean McGivern2016-12-131-1/+1
|\ \ | | | | | | | | | | | | Minor improvements to nested groups code See merge request !8011
| * | Rename Routable.where_paths_in to Routable.where_full_path_indz-nested-group-improvements-2Dmitriy Zaporozhets2016-12-111-1/+1
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'unescape-relative-path' into 'master' Gabriel Mazetto2016-12-121-8/+6
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid escaping relative links in Markdown twice ## What does this MR do? Avoid escaping relative links in Markdown twice. ## Why was this MR needed? Relative links with special characters (e.g. spaces) were escaped twice. ## What are the relevant issue numbers? closes #25191, #25318 See merge request !7940
| * Avoid escaping relative links in Markdown twice (!7940)winniehell2016-12-121-8/+6
| |
* | Add shorthand support to gitlab markdown referencesOswaldo Ferreira2016-12-025-60/+41
|/
* remove underscore from user-content id namespace22781-user-generated-permalinksMike Greiling2016-11-301-1/+1
|
* add transparent namespace to all user-generated anchors in GitLab flavored ↵Mike Greiling2016-11-301-3/+5
| | | | markdown
* Merge branch 'markdown-xss-fix-option-2.1' into 'security'Douwe Maan2016-11-091-10/+28
| | | | | | | | | | | | Fix for HackerOne XSS vulnerability in markdown This is an updated blacklist patch to fix https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2007. No text is removed. Dangerous schemes/protocols and invalid URIs are left intact but not linked. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23153 See merge request !2015 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'issue_23548_dev' into 'master'Douwe Maan2016-11-099-14/+78
| | | | | | | | | | | | | | | | | | | | | disable markdown in comments when referencing disabled features fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23548 This MR prevents the following references when tool is disabled: - issues - snippets - commits - when repo is disabled - commit range - when repo is disabled - milestones This MR does not prevent references to repository files, since they are just markdown links and don't leak information. See merge request !2011 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Split out markdown cache storage into a separate methodNick Thomas2016-11-041-1/+5
|
* Fix Markdown styling inside reference linkspanjan2016-11-015-42/+44
| | | | Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/18096
* Pass user instance to Labels::FindOrCreateService or skip_authorization: trueadam-fix-labels-find-or-createAdam Niedzielski2016-10-281-1/+1
| | | | | | Do not pass project.owner because it may return a group and Labels::FindOrCreateService throws an error in this case. Fixes #23694.
* Escape ref and path for relative links (!6050)winniehell2016-10-241-2/+2
|
* Merge branch 'feature/group-level-labels' into 'master' Douwe Maan2016-10-191-5/+46
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add group level labels ## What does this MR do? Add group level labels. ## Are there points in the code the reviewer needs to double check? * `LabelsFinder` * `Gitlab::Gfm::ReferenceRewriter` * `Banzai::Filter::LabelReferenceFilter` ## Why was this MR needed? We'll be adding more feature that allow you to do cross-project management of issues. ## Screenshots (if relevant) * Group Labels ![Group Labels](/uploads/2244c06ad68eae4fb246fb4c81bf8060/2.png) * Project Labels ![Project Labels](/uploads/c5839516d2282b51f7418d9dadbeceb4/1.png) * Expanded references for group labels when moving issue to another project ![Expanded references for group labels when moving issue to another project](/uploads/0c9ab248a8420d4978d59349ae3d42e5/3.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #19997 See merge request !6425
| * Reuse LabelsFinder on Banzai::Filter::LabelReferenceFilterDouglas Barbosa Alexandre2016-10-191-7/+1
| |
| * Fix replace label references with links for group labelsDouglas Barbosa Alexandre2016-10-191-1/+7
| |
| * Reuse LabelsFinder on Banzai::Filter::LabelReferenceFilterDouglas Barbosa Alexandre2016-10-191-7/+5
| |
| * Unfold references for group labels when moving issue to another projectDouglas Barbosa Alexandre2016-10-191-3/+36
| |
| * Add ProjectLabel modelDouglas Barbosa Alexandre2016-10-191-1/+1
| |
| * Replace label references with links for group labelsDouglas Barbosa Alexandre2016-10-191-3/+13
| |
* | Merge branch 'issue_828' into 'master' Douwe Maan2016-10-193-15/+38
|\ \ | |/ |/| | | | | | | | | Prevent wrong markdown on issue ids when project has Jira service activated fixes gitlab-org/gitlab-ee#828 See merge request !6728
| * Prevent wrong markdown on issue ids when project has Jira service activatedissue_828Felipe Artur2016-10-193-15/+38
| |
* | Merge branch 'fix-escaping' into 'master' Sean McGivern2016-10-191-1/+1
|\ \ | |/ |/| | | | | fix: commit messages being double-escaped in activities tab See merge request !6937
| * fix: commit messages being double-escaped in activies tabamaia2016-10-181-1/+1
| |
* | Add Nofollow for uppercased scheme in external urlthe-undefined2016-10-181-4/+30
|/ | | | | | | | | | | | Ensure that external URLs with non-lowercase protocols will be attributed with 'nofollow noreferrer' and open up in a new window. Covers the edge cases to skip: - HTTPS schemes - relative links Closes #22782
* Add RTL support to markdown rendererEbrahim Byagowi2016-10-162-1/+18
|
View Lorry Controller Status