diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-11 10:20:34 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-11 10:20:34 +0000 |
commit | 80f8cb2f8844566cda41529a2b0fd4b75eb3080d (patch) | |
tree | 4b09eaa8b1f86e8503badf57584117b25489d8f1 /lib/api/files.rb | |
parent | e794b561330070465a67ec57bc65069e12b78ef5 (diff) | |
parent | 8265d43d016d4bcd67ce1f7cb452a239953cf8bd (diff) | |
download | gitlab-ce-80f8cb2f8844566cda41529a2b0fd4b75eb3080d.tar.gz |
Merge branch 'fix_markup_encoding' into 'master'
Fix encoding of output of markup, prevent 500 for non-ascii characters
#### What does this MR do?
This MR forces the output of `Github::markup` to have the same encoding as the input to it.
#### Why was this MR needed?
This prevents 500 errors if the markup contains non-asci characters.
#### What are the relevant issue numbers / Feature requests?
This MR closes
* #296
* https://github.com/gitlabhq/gitlabhq/issues/7023
/cc @jacobvosmaer
See merge request !160
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions