1. 09 Jun, 2017 2 commits
  2. 25 May, 2017 1 commit
  3. 24 May, 2017 1 commit
  4. 09 May, 2017 1 commit
  5. 05 May, 2017 1 commit
  6. 04 May, 2017 1 commit
  7. 03 May, 2017 1 commit
  8. 28 Apr, 2017 1 commit
  9. 20 Apr, 2017 1 commit
  10. 13 Apr, 2017 1 commit
  11. 06 Apr, 2017 3 commits
  12. 22 Mar, 2017 1 commit
  13. 09 Mar, 2017 2 commits
  14. 06 Mar, 2017 2 commits
  15. 03 Mar, 2017 1 commit
  16. 27 Feb, 2017 1 commit
  17. 23 Feb, 2017 1 commit
  18. 21 Feb, 2017 1 commit
  19. 10 Feb, 2017 1 commit
  20. 19 Dec, 2016 2 commits
  21. 23 Nov, 2016 1 commit
  22. 22 Nov, 2016 1 commit
  23. 18 Nov, 2016 1 commit
  24. 24 Oct, 2016 1 commit
  25. 14 Oct, 2016 1 commit
  26. 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
  27. 05 Oct, 2016 1 commit
  28. 01 Sep, 2016 2 commits
  29. 30 Aug, 2016 1 commit
  30. 25 Aug, 2016 1 commit
  31. 24 Aug, 2016 1 commit
  32. 01 Aug, 2016 1 commit
    • zs's avatar
      State specific default sort order for issuables · cb4c5d66724c
      zs authored
      Provide more sensible default sort order for issues and merge requests
      based on the following table:
      
      | type           | state  | default sort order |
      |----------------|--------|--------------------|
      | issues         | open   | last created       |
      | issues         | closed | last updated       |
      | issues         | all    | last created       |
      | merge requests | open   | last created       |
      | merge requests | merged | last updated       |
      | merge requests | closed | last updated       |
      | merge requests | all    | last created       |
      cb4c5d66724c