1. 07 12月, 2017 1 次提交
  2. 14 11月, 2017 1 次提交
  3. 07 10月, 2017 1 次提交
  4. 06 7月, 2017 1 次提交
  5. 01 6月, 2017 1 次提交
  6. 31 5月, 2017 1 次提交
  7. 24 5月, 2017 2 次提交
  8. 04 5月, 2017 1 次提交
  9. 09 4月, 2017 1 次提交
  10. 06 4月, 2017 6 次提交
  11. 23 2月, 2017 1 次提交
  12. 06 9月, 2016 1 次提交
  13. 30 8月, 2016 1 次提交
  14. 22 8月, 2016 1 次提交
  15. 20 8月, 2016 2 次提交
  16. 19 8月, 2016 1 次提交
  17. 18 8月, 2016 2 次提交
  18. 17 8月, 2016 1 次提交
  19. 15 8月, 2016 1 次提交
  20. 13 8月, 2016 1 次提交
    • S
      Don't allow resolving invalid conflicts · 427e7246
      Sean McGivern 提交于
      An MR can only be resolved in the UI if:
      - It has conflicts.
      - It has valid diff_refs (in other words, it supports new diff notes).
      - It has no conflicts with one side missing.
      - It has no conflicts in binary files.
      - It has no conflicts in files too large to display.
      - It has no conflicts containing invalid conflict markers.
      427e7246
  21. 12 8月, 2016 1 次提交
  22. 02 8月, 2016 1 次提交
    • P
      Speedup DiffNote#active? on discussions, preloading noteables and avoid... · 8716ff7f
      Paco Guzman 提交于
      Speedup DiffNote#active? on discussions, preloading noteables and avoid touching git repository to return diff_refs when possible
      
      - Preloading noteable we share the same noteable instance when more than one 
      discussion refers to the same noteable.
      - Any other call to that object that is cached in that object will be for any 
      discussion.
      - In those cases where merge_request_diff has all the sha stored to build a diff_refs get that 
      diff_refs using directly those sha instead accessing to the git repository to first get the 
      commits and later the sha.
      8716ff7f
  23. 29 7月, 2016 1 次提交
  24. 26 7月, 2016 3 次提交
  25. 08 7月, 2016 1 次提交
  26. 07 7月, 2016 4 次提交