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