BigW Consortium Gitlab

  1. 25 May, 2017 1 commit
  2. 24 May, 2017 1 commit
  3. 09 May, 2017 1 commit
  4. 05 May, 2017 1 commit
  5. 04 May, 2017 1 commit
  6. 03 May, 2017 1 commit
  7. 28 Apr, 2017 1 commit
  8. 20 Apr, 2017 1 commit
  9. 13 Apr, 2017 1 commit
  10. 06 Apr, 2017 3 commits
  11. 22 Mar, 2017 1 commit
  12. 09 Mar, 2017 2 commits
  13. 06 Mar, 2017 2 commits
  14. 03 Mar, 2017 1 commit
  15. 27 Feb, 2017 1 commit
  16. 23 Feb, 2017 1 commit
  17. 21 Feb, 2017 1 commit
  18. 10 Feb, 2017 1 commit
  19. 19 Dec, 2016 2 commits
  20. 23 Nov, 2016 1 commit
  21. 22 Nov, 2016 1 commit
  22. 18 Nov, 2016 1 commit
  23. 24 Oct, 2016 1 commit
  24. 14 Oct, 2016 1 commit
  25. 13 Oct, 2016 2 commits
    • Fix specs · 241cca01
      Sean McGivern authored
    • 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).
  26. 05 Oct, 2016 1 commit
  27. 01 Sep, 2016 2 commits
  28. 30 Aug, 2016 1 commit
  29. 25 Aug, 2016 1 commit
  30. 24 Aug, 2016 1 commit
  31. 01 Aug, 2016 1 commit
    • State specific default sort order for issuables · 84a3225b
      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       |
  32. 14 Jul, 2016 1 commit
    • Load Javascript U2F library selectively. · 4b33c4c6
      Timothy Andrew authored
      1. Only on supported Chrome versions
      
      2. Mainly, this lets us simplify the javascript-based U2F check to
         `window.u2f`, where `window.u2f` can either be loaded from the GitLab
         server (for Chrome) or from the Firefox extension.
      
      3. This is a better way to provide browser detection for U2F.
  33. 18 Jun, 2016 1 commit