31522c5182
Add latest changes from gitlab-org/gitlab@master
2022-08-18 09:11:27 +00:00
4ec82c35f2
Add latest changes from gitlab-org/gitlab@master
2022-07-08 03:09:21 +00:00
1d9f78b3a4
Add latest changes from gitlab-org/gitlab@master
2021-07-28 15:09:57 +00:00
7e3f469a40
Add latest changes from gitlab-org/gitlab@master
2021-07-21 21:10:10 +00:00
fe30598cbd
Add latest changes from gitlab-org/gitlab@master
2021-06-08 06:09:51 +00:00
bdca097916
Add latest changes from gitlab-org/gitlab@master
2020-08-11 03:11:00 +00:00
c59765a50a
Add latest changes from gitlab-org/gitlab@master
2020-06-24 18:09:03 +00:00
27a18afc7d
Add latest changes from gitlab-org/gitlab@master
2020-02-04 00:09:04 +00:00
a048261403
Add latest changes from gitlab-org/gitlab@master
2019-11-21 09:06:16 +00:00
bd860c22f6
Add latest changes from gitlab-org/gitlab@master
2019-09-17 12:06:48 +00:00
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
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
GitLab Bot
Sean McGivern
Alejandro Rodríguez