diff options
| author | Vasiliy Yakliushin <vyaklushin@gmail.com> | 2019-07-04 16:11:44 +0200 |
|---|---|---|
| committer | Vasiliy Yakliushin <vyaklushin@gmail.com> | 2019-07-07 11:49:53 +0200 |
| commit | 22e2217c955d6d89b26758a17234a285565307a1 (patch) | |
| tree | 652bb2405e923659708ff52cb6b4e16c40678063 /app/helpers/markup_helper.rb | |
| parent | bd69c9197cefcb31ebabe466df005f1451ac1c46 (diff) | |
| download | gitlab-ce-22e2217c955d6d89b26758a17234a285565307a1.tar.gz | |
Fix undefined method `simple_format for MarkupHelper:Module
`simple_format` is not defined in ActionView::Helpers::TagHelper, but
it is actually located in ActionView::Helpers::TextHelper.
The solution is to include the correct helper.
I've also added tests for `#markup_unsafe` because they were missing.
Diffstat (limited to 'app/helpers/markup_helper.rb')
| -rw-r--r-- | app/helpers/markup_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb index 8ccb39f8444..c2b47098a8d 100644 --- a/app/helpers/markup_helper.rb +++ b/app/helpers/markup_helper.rb @@ -3,7 +3,7 @@ require 'nokogiri' module MarkupHelper - include ActionView::Helpers::TagHelper + include ActionView::Helpers::TextHelper include ::Gitlab::ActionViewOutput::Context def plain?(filename) |