An error occurred fetching the project authors.
  1. 12 Aug, 2016 7 commits
  2. 09 Aug, 2016 1 commit
  3. 03 Aug, 2016 2 commits
  4. 11 Jul, 2016 1 commit
  5. 08 Jul, 2016 2 commits
  6. 06 Jul, 2016 2 commits
  7. 01 Jul, 2016 1 commit
  8. 28 Jun, 2016 1 commit
  9. 27 Jun, 2016 1 commit
  10. 24 Jun, 2016 1 commit
    • Rémy Coutable's avatar
      Fix a wrong MR status when merge_when_build_succeeds &... · e3d464d8
      Rémy Coutable authored
      Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true
      
      The issue was that `MergeRequest#mergeable?` returns false when the CI
      state is not success and project.only_allow_merge_if_build_succeeds is
      true. In this case `Projects::MergeRequestsController#merge` would
      return the `:failed` status when enabling `merge_when_build_succeeds`,
      thus leading to a weird state and the MR never automatically merged.
      
      The fix is to disable the CI state check in the controller safeguard
      that early return the `:failed` status.
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      e3d464d8
  11. 03 Jun, 2016 4 commits
  12. 01 Jun, 2016 1 commit
    • Sean McGivern's avatar
      Don't allow merges with new commits · f680eca9
      Sean McGivern authored
      Set a `sha` parameter on the MR form. If this doesn't match the HEAD of
      the source branch when the form is submitted, show a warning (like with
      a merge conflict) and don't merge the branch.
      f680eca9
  13. 30 May, 2016 1 commit
  14. 19 Apr, 2016 1 commit
  15. 12 Apr, 2016 1 commit
  16. 11 Apr, 2016 1 commit
  17. 30 Mar, 2016 1 commit
  18. 21 Mar, 2016 1 commit
  19. 19 Mar, 2016 3 commits
  20. 18 Feb, 2016 1 commit
  21. 05 Feb, 2016 2 commits
  22. 04 Dec, 2015 1 commit
  23. 13 Nov, 2015 1 commit
  24. 23 Jun, 2015 1 commit
  25. 22 Jun, 2015 1 commit