1. 04 Jul, 2017 1 commit
    • Stan Hu's avatar
      Log rescued exceptions to Sentry · 63cfad1f7f12
      Stan Hu authored
      Support noticed that a number of exceptions, such as
      "Encoding::CompatibilityError (incompatible character encodings: UTF-8 and
      ASCII-8BIT)", failed to report to Sentry. The `rescue_from` in the
      ApplicationController prevented these exceptions from being recorded.
      This change ensures that these exceptions are properly captured.
      63cfad1f7f12
  2. 20 Jun, 2017 1 commit
  3. 09 Jun, 2017 4 commits
  4. 25 May, 2017 1 commit
  5. 24 May, 2017 1 commit
  6. 09 May, 2017 1 commit
  7. 05 May, 2017 1 commit
  8. 04 May, 2017 1 commit
  9. 03 May, 2017 1 commit
  10. 28 Apr, 2017 1 commit
  11. 20 Apr, 2017 1 commit
  12. 13 Apr, 2017 1 commit
  13. 06 Apr, 2017 3 commits
  14. 22 Mar, 2017 1 commit
  15. 09 Mar, 2017 2 commits
  16. 06 Mar, 2017 2 commits
  17. 03 Mar, 2017 1 commit
  18. 27 Feb, 2017 1 commit
  19. 23 Feb, 2017 1 commit
  20. 21 Feb, 2017 1 commit
  21. 10 Feb, 2017 1 commit
  22. 19 Dec, 2016 2 commits
  23. 23 Nov, 2016 1 commit
  24. 22 Nov, 2016 1 commit
  25. 18 Nov, 2016 1 commit
  26. 24 Oct, 2016 1 commit
  27. 14 Oct, 2016 1 commit
  28. 13 Oct, 2016 2 commits
    • Sean McGivern's avatar
      Fix specs · 3d0c2a8122bd
      Sean McGivern authored
      3d0c2a8122bd
    • Sean McGivern's avatar
      Allow setting content for resolutions · 0483c1e6acbc
      Sean McGivern authored
      When reading conflicts:
      
      1. Add a `type` field. `text` works as before, and has `sections`;
         `text-editor` is a file with ambiguous conflict markers that can only
         be resolved in an editor.
      2. Add a `content_path` field pointing to a JSON representation of the
         file's content for a single file.
      3. Hitting `content_path` returns a similar datastructure to the `file`,
         but without the `content_path` and `sections` fields, and with a
         `content` field containing the full contents of the file (with
         conflict markers).
      
      When writing conflicts:
      
      1. Instead of `sections` being at the top level, they are now in a
         `files` array. This matches the read format better.
      2. The `files` array contains file hashes, each of which must contain:
         a. `new_path`
         b. `old_path`
         c. EITHER `sections` (which works as before) or `content` (with the
            full content of the resolved file).
      0483c1e6acbc
  29. 05 Oct, 2016 1 commit
  30. 01 Sep, 2016 2 commits