1. 05 Nov, 2018 1 commit
  2. 30 Oct, 2018 1 commit
  3. 23 Oct, 2018 2 commits
  4. 22 Oct, 2018 1 commit
  5. 19 Oct, 2018 1 commit
  6. 17 Oct, 2018 2 commits
  7. 16 Oct, 2018 3 commits
  8. 29 Sep, 2018 1 commit
  9. 20 Sep, 2018 1 commit
  10. 18 Sep, 2018 1 commit
  11. 14 Sep, 2018 1 commit
  12. 11 Sep, 2018 2 commits
  13. 06 Sep, 2018 2 commits
  14. 20 Aug, 2018 1 commit
  15. 10 Aug, 2018 1 commit
  16. 03 Aug, 2018 1 commit
  17. 14 Jul, 2018 4 commits
  18. 05 Jul, 2018 1 commit
  19. 29 Jun, 2018 1 commit
  20. 14 Jun, 2018 2 commits
  21. 12 Jun, 2018 1 commit
  22. 05 Jun, 2018 2 commits
  23. 01 Jun, 2018 1 commit
  24. 23 May, 2018 1 commit
  25. 17 May, 2018 1 commit
    • lulalala's avatar
      Add cannot_be_merged_recheck merge_status · 47755321ff4a
      lulalala authored
      First, transitions between can_be_merged & cannot_be_merged are removed,
      as they are currently blocked in `check_if_can_be_merged`.
      `can_be_merge` always returns to `unchecked` first,
      before it can transition to `cannot_be_merged` (and vice versa).
      
      We want to avoid repeated notification triggered by repeated transition
      between `cannot_be_merged` & `unchecked`.
      
      So we added `cannot_be_merged_recheck` state, similar to `unchecked`,
      but as a mean to remember it’s from cannot_be_merged.
      
      See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18042/#note_65945407
      
      Since `unchecked` and `cannot_be_merged_recheck` both mean
      “we are in the middle of checking if it is mergeable”,
      quite often we need to see if merge_status is in either one of them,
      so `check_state?` is added to achieve this.
      47755321ff4a
  26. 23 Apr, 2018 1 commit
    • Zeger-Jan van de Weg's avatar
      Flowdock uses Gitaly, not Grit · a36ac77d35a4
      Zeger-Jan van de Weg authored
      Prior to this change, Flowdock used Grit to get the difference between
      commits and post that to the remote service. This required direct path
      access, which doesn't work with Gitaly.
      
      Fixes gitlab-org/gitaly#1113
      a36ac77d35a4
  27. 05 Apr, 2018 1 commit
  28. 28 Mar, 2018 1 commit
  29. 21 Mar, 2018 1 commit