1. 28 Feb, 2017 1 commit
  2. 23 Feb, 2017 2 commits
  3. 20 Feb, 2017 1 commit
  4. 16 Feb, 2017 1 commit
  5. 23 Jan, 2017 1 commit
  6. 17 Jan, 2017 1 commit
  7. 28 Nov, 2016 1 commit
  8. 24 Nov, 2016 1 commit
  9. 24 Oct, 2016 1 commit
  10. 17 Oct, 2016 1 commit
  11. 16 Sep, 2016 1 commit
  12. 25 Aug, 2016 1 commit
  13. 09 Aug, 2016 1 commit
  14. 01 Jul, 2016 1 commit
  15. 27 Jun, 2016 1 commit
  16. 03 Jun, 2016 2 commits
  17. 29 May, 2016 1 commit
  18. 16 May, 2016 1 commit
  19. 10 May, 2016 2 commits
  20. 26 Apr, 2016 1 commit
  21. 13 Apr, 2016 1 commit
  22. 12 Apr, 2016 3 commits
  23. 14 Jan, 2016 2 commits
  24. 13 Jan, 2016 1 commit
  25. 12 Feb, 2015 1 commit
  26. 25 Dec, 2014 1 commit
  27. 17 Jun, 2014 1 commit
  28. 13 Jun, 2014 2 commits
  29. 11 Apr, 2014 1 commit
  30. 16 Oct, 2013 1 commit
  31. 17 Sep, 2013 1 commit
  32. 18 Jul, 2013 1 commit
    • 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
  33. 14 May, 2013 1 commit