delta/gitlab/gitlab-ce.git/spec/support/test_env.rb, branch feature/github-edit-path

Fix resolving conflicts on forks

2016-08-30T10:56:11+00:00

Forks may not be up-to-date with the target project, and so might not
contain one of the parent refs in their repo. Fetch this if it isn't
present.

Handle non-UTF-8 conflicts gracefully

2016-08-25T07:27:08+00:00

These can't be resolved in the UI because if they aren't in a UTF-8
compatible encoding, they can't be rendered as JSON. Even if they could,
we would be implicitly changing the file encoding anyway, which seems
like a bad idea.

Add more tests for conflicts

2016-08-12T20:24:48+00:00

Add backend for merge conflicts reading

2016-08-12T20:24:43+00:00

Add failing test for #20462

2016-08-02T01:32:28+00:00

Trim extra displayed carriage returns in diffs and files with CRLFs

2016-08-01T11:24:06+00:00

Closes #20440

Ensure relative paths for video are rewritten as we do for images

2016-07-26T08:22:17+00:00

Signed-off-by: Rémy Coutable

Collapsed diffs lines/size don't accumulate to overflow diffs.

2016-07-18T20:43:28+00:00

Fix feature specs on CI

2016-07-11T11:02:13+00:00

MySQL's text column isn't big enough for the diffs in the
expand-collapse-diffs branch.

Support renames in diff_for_path actions

2016-07-11T08:31:34+00:00