BigW Consortium Gitlab

  1. 27 Jun, 2016 1 commit
  2. 24 Jun, 2016 1 commit
    • 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: 's avatarRémy Coutable <remy@rymai.me>
  3. 03 Jun, 2016 4 commits
  4. 01 Jun, 2016 1 commit
    • 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.
  5. 30 May, 2016 1 commit
  6. 19 Apr, 2016 1 commit
  7. 12 Apr, 2016 1 commit
  8. 11 Apr, 2016 1 commit
  9. 30 Mar, 2016 1 commit
  10. 21 Mar, 2016 1 commit
  11. 19 Mar, 2016 3 commits
  12. 18 Feb, 2016 1 commit
  13. 05 Feb, 2016 2 commits
  14. 04 Dec, 2015 1 commit
  15. 13 Nov, 2015 1 commit
  16. 23 Jun, 2015 1 commit
  17. 22 Jun, 2015 1 commit
  18. 17 Jun, 2015 2 commits
  19. 28 Apr, 2015 1 commit
  20. 14 Feb, 2015 1 commit
    • Upgrade to Rails 4.1.9 · 76aad9b7
      Vinnie Okada authored
      Make the following changes to deal with new behavior in Rails 4.1.2:
      
      * Use nested resources to avoid slashes in arguments to path helpers.
  21. 12 Feb, 2015 2 commits
  22. 06 Aug, 2014 1 commit
  23. 22 Jan, 2014 1 commit
  24. 14 Jan, 2014 1 commit
  25. 12 Sep, 2013 1 commit
  26. 20 Aug, 2013 1 commit
  27. 18 Jul, 2013 1 commit
    • Merge Request on forked projects · 3d7194f0
      Izaak Alpert authored
      The good:
      
       - You can do a merge request for a forked commit and it will merge properly (i.e. it does work).
       - Push events take into account merge requests on forked projects
       - Tests around merge_actions now present, spinach, and other rspec tests
       - Satellites now clean themselves up rather then recreate
      
      The questionable:
      
       - Events only know about target projects
       - Project's merge requests only hold on to MR's where they are the target
       - All operations performed in the satellite
      
      The bad:
      
        -  Duplication between project's repositories and satellites (e.g. commits_between)
      
      (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos)
      
      Fixes:
      
      Make test repos/satellites only create when needed
      -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap)
      -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually
      -fixed remote removal
      -How to merge renders properly
      -Update emails to show project/branches
      -Edit MR doesn't set target branch
      -Fix some failures on editing/creating merge requests, added a test
      -Added back a test around merge request observer
      -Clean up project_transfer_spec, Remove duplicate enable/disable observers
      -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well
      -Signifant speed ups for tests
      -Update formatting ordering in notes_on_merge_requests
      -Remove wiki schema update
      Fixes for search/search results
      -Search results was using by_project for a list of projects, updated this to use in_projects
      -updated search results to reference the correct (target) project
      -udpated search results to print both sides of the merge request
      
      Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
  28. 23 Jun, 2013 1 commit
  29. 07 Apr, 2013 1 commit
  30. 01 Apr, 2013 1 commit
  31. 15 Jan, 2013 1 commit
  32. 04 Jan, 2013 1 commit