Skip to content
Snippets Groups Projects
  1. Oct 09, 2013
  2. Aug 21, 2013
  3. Aug 17, 2013
  4. Aug 15, 2013
  5. Aug 12, 2013
  6. Aug 10, 2013
  7. Aug 08, 2013
  8. Aug 02, 2013
  9. Aug 01, 2013
  10. Jul 18, 2013
    • Dmitriy Zaporozhets's avatar
      fe7bef3a
    • Izaak Alpert's avatar
      MR on fork: Some cleanup, test updates · 5d56da6b
      Izaak Alpert authored
      -The forked merge request test now tests it's componenets again, and seems to work every time (did this by reordering the branch updates so their is more time for update_branches to run) -- this could still technically fail, but after several runs it doesn't seem to.
      -Removed todo in merge_request, pushed wrapping of grit down to the satellite
      -updated action test to check flock status, made it nolonger pending
      -moved all logging on failure to helper method in satellite
      GITLAB-592
      
      Change-Id: If0554ca35eedc3d3e8461f7d93d4b3939fa2cd75
      5d56da6b
    • Izaak Alpert's avatar
      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
      3d7194f0
  11. Jul 13, 2013
  12. Jul 12, 2013
  13. Jul 09, 2013
  14. Jul 04, 2013
  15. Jun 07, 2013
  16. Jun 06, 2013
  17. Apr 19, 2013
  18. Apr 06, 2013
  19. Apr 04, 2013
  20. Apr 03, 2013
  21. Mar 20, 2013
  22. Mar 19, 2013
  23. Mar 14, 2013
  24. Mar 13, 2013
  25. Mar 04, 2013
  26. Feb 28, 2013
  27. Feb 11, 2013
  28. Jan 31, 2013
  29. Jan 27, 2013
  30. Jan 25, 2013
  31. Jan 17, 2013
  32. Jan 11, 2013
  33. Jan 10, 2013
Loading