BigW Consortium Gitlab

  1. 11 Dec, 2016 1 commit
  2. 06 Dec, 2016 1 commit
  3. 30 Nov, 2016 1 commit
  4. 23 Nov, 2016 1 commit
  5. 21 Nov, 2016 1 commit
  6. 17 Nov, 2016 5 commits
  7. 16 Nov, 2016 1 commit
  8. 09 Nov, 2016 1 commit
    • Add button to delete all merged branches · 1afab9eb
      Toon Claes authored
      It adds a button to the branches page that the user can use to delete
      all the branches that are already merged. This can be used to clean up
      all the branches that were forgotten to delete while merging MRs.
      
      Fixes #21076.
  9. 07 Nov, 2016 5 commits
  10. 27 Oct, 2016 1 commit
  11. 24 Oct, 2016 1 commit
  12. 21 Oct, 2016 1 commit
  13. 19 Oct, 2016 2 commits
  14. 17 Oct, 2016 3 commits
  15. 16 Oct, 2016 1 commit
  16. 15 Oct, 2016 1 commit
  17. 14 Oct, 2016 3 commits
  18. 13 Oct, 2016 1 commit
    • Allow setting content for resolutions · 3f71c43e
      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).
  19. 12 Oct, 2016 1 commit
  20. 11 Oct, 2016 3 commits
  21. 08 Oct, 2016 1 commit
  22. 06 Oct, 2016 4 commits