Skip to content
GitLab Next
  • Menu
Projects Groups Snippets
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • GitLab FOSS GitLab FOSS
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
    • Requirements
  • Merge requests 1
    • Merge requests 1
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Container Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • Code review
    • Insights
    • Issue
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • GitLab.org
  • GitLab FOSSGitLab FOSS
  • Merge requests
  • !5961

Handle non-UTF-8 conflicts gracefully

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Sean McGivern requested to merge 21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data into master Aug 23, 2016
  • Overview 8
  • Commits 1
  • Pipelines 1
  • Changes 6

What does this MR do?

If a conflict file isn't in a UTF-8-compatible encoding, we can't resolve it in the UI.

Are there points in the code the reviewer needs to double check?

Is the regex the best way of doing this?

Why was this MR needed?

It's a bug in a new feature 😞

What are the relevant issue numbers?

Closes #21247 (closed).

Does this MR meet the acceptance criteria?

  • CHANGELOG entry added
  • Documentation created/updated (N/A)
  • API support added (N/A)
  • Tests
    • Added for this feature/bug
    • All builds are passing
  • Conform by the style guides
  • Branch has no merge conflicts with master (if you do - rebase it please)
  • Squashed related commits together
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: 21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data