BigW Consortium Gitlab

  1. 04 Apr, 2018 2 commits
  2. 03 Apr, 2018 2 commits
  3. 30 Mar, 2018 2 commits
  4. 27 Mar, 2018 1 commit
  5. 23 Mar, 2018 1 commit
    • Fix 500 error when trying to resolve non-ASCII conflicts in editor · 70af1e2e
      Sean McGivern authored
      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).
  6. 22 Mar, 2018 1 commit
  7. 21 Mar, 2018 2 commits
  8. 19 Mar, 2018 1 commit
  9. 16 Mar, 2018 1 commit
  10. 15 Mar, 2018 2 commits
  11. 12 Mar, 2018 1 commit
  12. 08 Mar, 2018 2 commits
  13. 07 Mar, 2018 9 commits
  14. 06 Mar, 2018 3 commits
  15. 05 Mar, 2018 1 commit
  16. 02 Mar, 2018 2 commits
  17. 01 Mar, 2018 3 commits
  18. 28 Feb, 2018 1 commit
  19. 26 Feb, 2018 2 commits
  20. 23 Feb, 2018 1 commit