diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-03-23 15:02:05 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-03-23 18:33:14 +0000 |
| commit | 70af1e2e03c031105117596e398f82dee4ae61a4 (patch) | |
| tree | c679a2c4377fdb7b06ba59745673ba30ac63f603 /tmp | |
| parent | b06a44c4ea85b813c0e6497ad801c3367abbf973 (diff) | |
| download | gitlab-ce-70af1e2e03c031105117596e398f82dee4ae61a4.tar.gz | |
Fix 500 error when trying to resolve non-ASCII conflicts in editor
When we added caching, this meant that calling `can_be_resolved_in_ui?` didn't
always call `lines`, which meant that we didn't get the benefit of the
side-effect from that, where it forced the conflict data itself to UTF-8.
To fix that, make this explicit by separating the `raw_content` (any encoding)
from the `content` (which is either UTF-8, or an exception is raised).
Diffstat (limited to 'tmp')
0 files changed, 0 insertions, 0 deletions