Skip to content
Snippets Groups Projects
  1. Oct 09, 2013
  2. Aug 27, 2013
  3. Aug 19, 2013
  4. Aug 05, 2013
  5. Jul 27, 2013
  6. Jul 18, 2013
    • 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
  7. Jul 16, 2013
  8. Jul 12, 2013
  9. Jul 01, 2013
  10. Jun 30, 2013
  11. Jun 26, 2013
  12. Jun 24, 2013
  13. Jun 23, 2013
  14. Jun 22, 2013
  15. Jun 18, 2013
  16. Jun 13, 2013
  17. Jun 11, 2013
  18. Jun 09, 2013
  19. Jun 06, 2013
  20. Jun 05, 2013
  21. May 30, 2013
  22. May 14, 2013
  23. May 07, 2013
  24. May 06, 2013
  25. May 05, 2013
  26. May 04, 2013
  27. Apr 15, 2013
  28. Apr 11, 2013
  29. Apr 07, 2013
  30. Apr 03, 2013
  31. Mar 27, 2013
  32. Mar 25, 2013
Loading