Skip to content
Snippets Groups Projects
  1. May 08, 2017
  2. May 05, 2017
  3. Apr 19, 2017
  4. Apr 06, 2017
  5. Mar 21, 2017
  6. Mar 17, 2017
  7. Mar 09, 2017
  8. Mar 05, 2017
  9. Mar 02, 2017
  10. Feb 25, 2017
  11. Feb 19, 2017
  12. Feb 16, 2017
    • 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
  13. Feb 09, 2017
  14. Feb 07, 2017
  15. Feb 02, 2017
  16. Jan 22, 2017
  17. Jan 18, 2017
  18. Jan 10, 2017
  19. Dec 21, 2016
  20. Dec 14, 2016
  21. Dec 12, 2016
  22. Dec 05, 2016
  23. Nov 22, 2016
  24. Nov 19, 2016
  25. Nov 07, 2016
  26. Oct 26, 2016
  27. Oct 17, 2016
  28. Oct 14, 2016
Loading