diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-05-22 19:37:26 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-05-22 19:37:26 +0000 |
| commit | 5431af8b3d4858ac72e796b42bd252d279e53f50 (patch) | |
| tree | 7cbc98b0022a864557e07e8f0acedabc0b4ddbe9 /app | |
| parent | 20375f811a6ffa35568d70b97a3793b97231d0dd (diff) | |
| parent | f9f9147290b5bc315e595e059c851593c1fc466f (diff) | |
| download | gitlab-ce-5431af8b3d4858ac72e796b42bd252d279e53f50.tar.gz | |
Merge branch '62116-performance-issue-502-errors-on-rendering-of-issues-with-heavy-markdown-contents' into 'master'
Resolve "Performance issue: 502 errors on rendering of issues with heavy markdown contents"
Closes #62116
See merge request gitlab-org/gitlab-ce!28597
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/page_layout_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb index 5038dcf9746..ec1d8577f36 100644 --- a/app/helpers/page_layout_helper.rb +++ b/app/helpers/page_layout_helper.rb @@ -1,3 +1,4 @@ +# coding: utf-8 # frozen_string_literal: true module PageLayoutHelper @@ -36,7 +37,7 @@ module PageLayoutHelper if description.present? @page_description = description.squish elsif @page_description.present? - sanitize(@page_description, tags: []).truncate_words(30) + sanitize(@page_description.truncate_words(30), tags: []) end end |