An error occurred fetching the project authors.
  1. 05 Mar, 2017 1 commit
  2. 02 Mar, 2017 1 commit
  3. 25 Feb, 2017 1 commit
  4. 19 Feb, 2017 1 commit
  5. 16 Feb, 2017 1 commit
    • Sean McGivern's avatar
      Show merge errors in merge request widget · 7a9d3a3c
      Sean McGivern authored
      There were two problems here:
      
      1. On the JS side, the reference to $widgetBody didn't refer to the
         right DOM element any more. This might be because it was replaced by
         the `getMergeStatus` method. Even if it wasn't, ensuring we have the
         right element means that the content gets updated.
      
      2. On the Ruby side, the `log_merge_error` method didn't update the
         `merge_error` column of the merge request. Change that to update if
         requested, and update in the most common cases by default.
      
         Additionally, this would sometimes return an error hash, but it
         doesn't look like this was ever used (the return value of
         `MergeService#execute` appears to be unused everywhere).
      7a9d3a3c
  6. 09 Feb, 2017 1 commit
  7. 07 Feb, 2017 1 commit
  8. 02 Feb, 2017 2 commits
  9. 22 Jan, 2017 2 commits
  10. 18 Jan, 2017 4 commits
  11. 10 Jan, 2017 1 commit
  12. 21 Dec, 2016 2 commits
  13. 14 Dec, 2016 1 commit
  14. 12 Dec, 2016 1 commit
  15. 05 Dec, 2016 1 commit
  16. 22 Nov, 2016 1 commit
  17. 19 Nov, 2016 1 commit
  18. 07 Nov, 2016 1 commit
  19. 26 Oct, 2016 1 commit
  20. 17 Oct, 2016 4 commits
  21. 14 Oct, 2016 3 commits
  22. 08 Sep, 2016 1 commit
  23. 12 Aug, 2016 1 commit
  24. 25 Jul, 2016 1 commit
  25. 24 Jul, 2016 1 commit