An error occurred fetching the project authors.
  1. 03 Apr, 2017 2 commits
  2. 02 Apr, 2017 2 commits
  3. 31 Mar, 2017 3 commits
  4. 30 Mar, 2017 4 commits
  5. 27 Mar, 2017 1 commit
  6. 23 Mar, 2017 1 commit
  7. 08 Mar, 2017 1 commit
  8. 03 Mar, 2017 1 commit
  9. 23 Feb, 2017 8 commits
  10. 21 Feb, 2017 1 commit
    • Sean McGivern's avatar
      Use sparse checkout for squashes · c13d28c9
      Sean McGivern authored
      For large repos, the checkout as part of creating a worktree can be very
      expensive. This can be so expensive that processes get 'stuck' on
      GitLab.com.
      
      To make this cheaper, configure sparse checkout for squash worktrees so
      that we only check out the files that were changed in the target
      branch (new files don't need to be included).
      
      Also add specs to cover the case where only new files are added, and the
      case where the diff isn't shown in the merge request because it's too
      large.
      c13d28c9
  11. 03 Feb, 2017 1 commit
  12. 01 Feb, 2017 1 commit
  13. 19 Jan, 2017 1 commit
  14. 14 Nov, 2016 1 commit
  15. 10 Nov, 2016 1 commit
  16. 07 Nov, 2016 1 commit
  17. 17 Oct, 2016 1 commit
  18. 15 Oct, 2016 1 commit
  19. 13 Oct, 2016 1 commit
  20. 09 Oct, 2016 1 commit
  21. 30 Aug, 2016 1 commit
    • Sean McGivern's avatar
      Fix resolving conflicts on forks · 1bda1e62
      Sean McGivern authored
      Forks may not be up-to-date with the target project, and so might not
      contain one of the parent refs in their repo. Fetch this if it isn't
      present.
      1bda1e62
  22. 25 Aug, 2016 1 commit
    • Sean McGivern's avatar
      Handle non-UTF-8 conflicts gracefully · 44eb3197
      Sean McGivern authored
      These can't be resolved in the UI because if they aren't in a UTF-8
      compatible encoding, they can't be rendered as JSON. Even if they could,
      we would be implicitly changing the file encoding anyway, which seems
      like a bad idea.
      44eb3197
  23. 17 Aug, 2016 1 commit
  24. 12 Aug, 2016 2 commits
  25. 02 Aug, 2016 1 commit