1. 21 Feb, 2017 1 commit
  2. 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
  3. 13 Feb, 2017 1 commit
  4. 10 Feb, 2017 3 commits
  5. 08 Feb, 2017 1 commit
  6. 07 Feb, 2017 2 commits
  7. 03 Feb, 2017 5 commits
  8. 02 Feb, 2017 1 commit
  9. 31 Jan, 2017 1 commit
    • Rydkin Maxim's avatar
      refactor merge request build service · 14326c88
      Rydkin Maxim authored
      add changelog entry
      
      replace local variables `merge_request` with instance ones
      
      modify `MergeRequests::BuildService` to fix failed tests
      
      extract `assign_target_project` method
      
      remove unnecessary instance variables
      
      remove exclamation marks and rewrite conditionals to improve readability
      
      extract `params_does_not_contain_branches?` method, rename `unprepared_merge_request` method to `uncreatable_merge_request`
      
      replace instance variables `merge_request` and `error_messages` with getters and setters; divide `set_title_and_description` method on two separate ones
      
      refactor `execute` method
      
      return `set_title_and_description` method
      
      rename `branches_selected?` method to `branches_present?` to make it more different from `branches_specified?`
      
      fixes after discussion
      
      renamed method branches_valid?
      
      fix space
      
      return assigning methods into `execute` method
      
      simplify `find_target_branch` and `find_source_project` methods
      
      fix spec `merge request issuable record that supports slash commands in its description and notes`
      14326c88
  10. 27 Jan, 2017 1 commit
  11. 26 Jan, 2017 1 commit
  12. 22 Jan, 2017 1 commit
  13. 21 Jan, 2017 1 commit
  14. 19 Jan, 2017 1 commit
  15. 18 Jan, 2017 1 commit
  16. 17 Jan, 2017 1 commit
  17. 13 Jan, 2017 1 commit
  18. 12 Jan, 2017 1 commit
  19. 11 Jan, 2017 1 commit
  20. 09 Jan, 2017 5 commits
  21. 03 Jan, 2017 1 commit
  22. 31 Dec, 2016 1 commit
  23. 29 Dec, 2016 1 commit
  24. 28 Dec, 2016 1 commit
  25. 26 Dec, 2016 1 commit
  26. 21 Dec, 2016 1 commit
  27. 16 Dec, 2016 3 commits