kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss

Fork 0

Commit graph

Author	SHA1	Message	Date
GitLab Bot	bd860c22f6	Add latest changes from gitlab-org/gitlab@master	2019-09-17 12:06:48 +00:00
Sean McGivern	70af1e2e03	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).	2018-03-23 18:33:14 +00:00
Alejandro Rodríguez	faa9bd402d	Create a Gitlab::Git submodule for conlict-related files Rename classes to (hopefully) clearer names while we're doing that.	2017-10-12 22:03:15 -03:00

Author

SHA1

Message

Date

GitLab Bot

bd860c22f6

Add latest changes from gitlab-org/gitlab@master

2019-09-17 12:06:48 +00:00

Sean McGivern

70af1e2e03

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).

2018-03-23 18:33:14 +00:00

Alejandro Rodríguez

faa9bd402d

Create a Gitlab::Git submodule for conlict-related files

Rename classes to (hopefully) clearer names while we're doing that.

2017-10-12 22:03:15 -03:00

3 commits