| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'extract-ee-specific-banzai-filters' into 'master' | Robert Speicher | 2018-07-17 | 3 | -10/+28 |
| |\ | | | | | | | | | Extract EE-specific lines from Banzai pipelines See merge request gitlab-org/gitlab-ce!20636 | ||||
| | * | Extract EE-specific lines from Banzai pipelinesextract-ee-specific-banzai-filters | Sean McGivern | 2018-07-13 | 3 | -10/+28 |
| | | | |||||
| * | | Merge branch 'satishperala/gitlab-ce-20720_webhooks_full_image_url' into ↵ | Douwe Maan | 2018-07-17 | 1 | -21/+1 |
| |\ \ | |/ |/| | | | | | | | | | | | | | 'master' Include full image URL in webhooks for uploaded images Closes #20720 See merge request gitlab-org/gitlab-ce!18109 | ||||
| | * | Merge branch 'master' into satishperala/gitlab-ce-20720_webhooks_full_image_url | Sean McGivern | 2018-07-06 | 7 | -28/+23 |
| | |\ | |||||
| | * | | Add documentation and specs for webhook URL rewriting | Sean McGivern | 2018-07-06 | 1 | -21/+1 |
| | | | | |||||
| * | | | Updates from `rubocop -a` | Lin Jen-Shin | 2018-07-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | Improve render performance of large wiki pages | Peter Leitzen | 2018-07-07 | 1 | -3/+8 |
| | |/ |/| | | | | | | | | | Compile often used regexps only once outside of the loop. This commit improves the performance of large wiki pages with many, many references. | ||||
| * | | Merge branch 'pravi/gitlab-ce-update-html-pipeline' into 'master' | Douwe Maan | 2018-07-04 | 1 | -12/+5 |
| |\ \ | | | | | | | | | | | | | | | | | | | update html-pipeline 2.7.1 -> 2.8 Closes #48571 See merge request gitlab-org/gitlab-ce!20348 | ||||
| | * | | Use strong_memoize to customize the SanitizationFilter whitelist | Robert Speicher | 2018-07-03 | 1 | -12/+5 |
| | | | | | | | | | | | | | I never liked the hacky `customized?` method anyway, so this is cleaner. | ||||
| | * | | dup whitelist before modification | Pirate Praveen | 2018-06-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | Fixes ActionView::Template::Error (can't modify frozen Hash) #48415 | ||||
| * | | | Merge branch '44994-osw-use-monospaced-font-on-diffs-commit-ref' into 'master' | Robert Speicher | 2018-07-03 | 2 | -3/+10 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Render SHA in merge request commit reference with mono spaced font" Closes #44994 See merge request gitlab-org/gitlab-ce!20228 | ||||
| | * | | | Use monospaced font for MR diff commit link ref on GFM | Oswaldo Ferreira | 2018-06-27 | 2 | -3/+10 |
| | | | | | |||||
| * | | | | Remove outdated comment from emoji_filter.rb | Douwe Maan | 2018-07-02 | 1 | -4/+0 |
| | |/ / |/| | | |||||
| * | | | Remove unused asset host logic from GfmPipeline and EmojiFilter spec | Douwe Maan | 2018-06-29 | 1 | -5/+1 |
| |/ / | |||||
| * | | Fix performance bottleneck when rendering large wiki pages | Sean McGivern | 2018-06-26 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | `Nokogiri::XML::Node#ancestors` appears to be much slower than `HTML::Pipeline::Filter#has_ancestor?` for these purposes. We already use `#has_ancestor?` elsewhere, so this change also makes this filter more consistent with other banzai filters. | ||||
| * | | Merge branch 'security-2682-fix-xss-for-markdown-toc' into 'master' | Alessio Caiazza | 2018-06-25 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | [master] Fix xss for Markdown elements where [[_TOC_]] is enabled See merge request gitlab/gitlabhq!2400 | ||||
| | * | | Fix xss for Markdown elements where [[_TOC_]] is enabled | Mark Chao | 2018-06-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'security-fj-bumping-sanitize-gem' into 'master' | Alessio Caiazza | 2018-06-25 | 1 | -1/+2 |
| |\ \ \ | |_|/ |/| | | | | | | | | [master] Update sanitize gem to 4.6.5 to fix HTML injection vulnerability See merge request gitlab/gitlabhq!2399 | ||||
| | * | | Whitelist text-align property for th and td | Douwe Maan | 2018-06-18 | 1 | -1/+2 |
| | | | | |||||
| * | | | Allow trailing whitespace on blockquote fence lines | Douwe Maan | 2018-06-18 | 1 | -6/+6 |
| |/ / | |||||
| * | | Rails5 fix passing Group objects array into for_projects_and_groups ↵ | Jasper Maes | 2018-06-14 | 1 | -1/+1 |
| |/ | | | | milestone scope | ||||
| * | enable CommonMark as the default | Brett Walker | 2018-06-14 | 1 | -1/+1 |
| | | |||||
| * | Fix Banzai reference for milestones belonging to parent groups | Mario de la Ossa | 2018-06-12 | 1 | -1/+1 |
| | | |||||
| * | Eager load project routes for issue references | Yorick Peterse | 2018-05-28 | 1 | -1/+2 |
| | | | | | | This reduces the number of queries necessary when displaying the activity page of a group. | ||||
| * | Use ApplicationSetting.current_without_cache instead of ↵ | Rémy Coutable | 2018-05-23 | 1 | -1/+1 |
| | | | | | | | ApplicationSetting.current where applicable Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Fix double brackets being linkified in wiki markdown | Alex | 2018-05-18 | 1 | -0/+3 |
| | | |||||
| * | Resolve "Expand API: Render an arbitrary Markdown document" | blackst0ne | 2018-05-18 | 2 | -3/+3 |
| | | |||||
| * | Fix commit trailer rendering when Gravatar is disabled | Douwe Maan | 2018-04-25 | 1 | -1/+0 |
| | | |||||
| * | make call to 'html_escape' unambiguous | Brett Walker | 2018-04-17 | 2 | -2/+2 |
| | | |||||
| * | Fix reference filters in group context | Jan Provaznik | 2018-04-12 | 7 | -16/+28 |
| | | | | | | | | | | Since !18150 abstract reference filter supports also `group` as a resource parent (not only `project`). Some reference filters, which inherit from abstract filter, depend on parent being `project` when checking a reference. This patch adds explicit check of parent class to the given filters. | ||||
| * | Support Markdown rendering using multiple projectsrendering-markdown-multiple-projects | Yorick Peterse | 2018-04-11 | 11 | -48/+123 |
| | | | | | | | | | | | | | | | | | | | | This refactors the Markdown pipeline so it supports the rendering of multiple documents that may belong to different projects. An example of where this happens is when displaying the event feed of a group. In this case we retrieve events for all projects in the group. Previously we would group events per project and render these chunks separately, but this would result in many SQL queries being executed. By extending the Markdown pipeline to support this out of the box we can drastically reduce the number of SQL queries. To achieve this we introduce a new object to the pipeline: Banzai::RenderContext. This object simply wraps two other objects: an optional Project instance, and an optional User instance. On its own this wouldn't be very helpful, but a RenderContext can also be used to associate HTML documents with specific Project instances. This work is done in Banzai::ObjectRenderer and allows us to reuse as many queries (and results) as possible. | ||||
| * | Merge branch '17939-osw-patch-support-gfm' into 'master' | Sean McGivern | 2018-04-06 | 1 | -0/+4 |
| |\ | | | | | | | | | | | | | Add support for patch link extension for commit links on GFM Closes #17939 See merge request gitlab-org/gitlab-ce!18229 | ||||
| | * | Add support for patch link extension for commit links on GFM | Oswaldo Ferreira | 2018-04-06 | 1 | -0/+4 |
| | | | |||||
| * | | Better group support notes-related code | Jan Provaznik | 2018-04-05 | 3 | -20/+51 |
| |/ | | | | | | | Updates notes-related services and rendering so this code can be easily used for group-scoped resources (specifically Epics). Related to gitlab-ee!5205 | ||||
| * | Merge branch 'osw-41401-render-mr-commit-sha-instead-diffs' into 'master' | Sean McGivern | 2018-04-04 | 5 | -5/+44 |
| |\ | | | | | | | | | Render MR commit SHA instead "diffs" when viable on GFM See merge request gitlab-org/gitlab-ce!18141 | ||||
| | * | Render MR commit SHA instead "diffs" when viableosw-41401-render-mr-commit-sha-instead-diffs | Oswaldo Ferreira | 2018-04-04 | 5 | -5/+44 |
| | | | |||||
| * | | Allow assigning and filtering issuables by ancestor group labels | Felipe Artur | 2018-04-04 | 1 | -1/+1 |
| | | | |||||
| * | | Add banzai filter to detect commit message trailers and properly link the users | Omar Mekky | 2018-04-04 | 2 | -0/+163 |
| | | | |||||
| * | | Bump html-pipeline to 2.7.1blackst0ne-bump-html-pipeline-gem | blackst0ne | 2018-04-02 | 3 | -3/+3 |
| | | | |||||
| * | | Fix auto-linking with escaped HTML entities | Sean McGivern | 2018-03-28 | 1 | -2/+6 |
| | | | | | | | | | | | | | We displayed the correct text as the link text (without double-encoding), but didn't do the same for the actual link target, so any link containing an ampersand would break when auto-linked. | ||||
| * | | Add ?, !, and : to trailing puncutation excluded from auto-linking | Sean McGivern | 2018-03-23 | 1 | -5/+6 |
| | | | |||||
| * | | Fix issuable state indicator | Jan Provaznik | 2018-03-23 | 1 | -1/+9 |
| |/ | | | | | | | | | | | Now the issuable reference check works only in project scope, if we reference an issuable from a non-project resource (e.g. epics), then project is not set, and there is mismatch in generated issue references. This patch enables issuable reference state check also from group scope. Closes gitlab-ee#4683 Related to #30916 | ||||
| * | move render_gfm into behaviors directory | Mike Greiling | 2018-03-19 | 1 | -2/+2 |
| | | |||||
| * | Manually escape '#' when building relative uris, fixes #42459 | Jan | 2018-03-11 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'replace_redcarpet_with_cmark' into 'master' | Sean McGivern | 2018-03-07 | 7 | -35/+133 |
| |\ | | | | | | | | | Add CommonMark markdown engine See merge request gitlab-org/gitlab-ce!14835 | ||||
| | * | Add CommonMark markdown enginereplace_redcarpet_with_cmark | blackst0ne | 2018-03-07 | 7 | -35/+133 |
| | | | |||||
| * | | Add Gitaly N+1 notice for Banzai filtering | Alejandro Rodríguez | 2018-03-05 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch '41719-mr-title-fix' into 'master' | Douwe Maan | 2018-03-05 | 1 | -46/+40 |
| |\ \ | |/ |/| | | | | | | | | | Render htmlentities correctly for links not supported by Rinku Closes #41719 See merge request gitlab-org/gitlab-ce!17180 | ||||
| | * | Match Rinku's behaviour for closing punctuation in links41719-mr-title-fix | Sean McGivern | 2018-03-02 | 1 | -15/+35 |
| | | | | | | | | | | | | | | | | | | | | | Rinku 2.0.0 (the version we use) will remove the last character of a link if it's a closing part of a punctuation pair (different types of parentheses and quotes), unless both of the below are true: 1. The matching pair has different start and end characters. 2. There are equal numbers of both in the matched string (they don't have to be balanced). | ||||
| | * | Render htmlentities correctly for links not supported by Rinku | Jarka Kadlecová | 2018-02-21 | 1 | -31/+5 |
| | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |