1. 12 11月, 2013 2 次提交
  2. 22 10月, 2013 1 次提交
  3. 21 10月, 2013 1 次提交
  4. 17 10月, 2013 1 次提交
  5. 13 10月, 2013 2 次提交
  6. 10 10月, 2013 1 次提交
  7. 09 10月, 2013 1 次提交
  8. 24 9月, 2013 1 次提交
  9. 12 9月, 2013 1 次提交
  10. 21 8月, 2013 1 次提交
  11. 17 8月, 2013 1 次提交
  12. 15 8月, 2013 1 次提交
  13. 12 8月, 2013 1 次提交
  14. 11 8月, 2013 2 次提交
  15. 08 8月, 2013 1 次提交
  16. 02 8月, 2013 2 次提交
  17. 18 7月, 2013 3 次提交
    • D
      squash commit summary in one sentence · fe7bef3a
      Dmitriy Zaporozhets 提交于
      fe7bef3a
    • I
      MR on fork: Some cleanup, test updates · 5d56da6b
      Izaak Alpert 提交于
      -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
    • I
      Merge Request on forked projects · 3d7194f0
      Izaak Alpert 提交于
      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
  18. 13 7月, 2013 1 次提交
  19. 12 7月, 2013 1 次提交
  20. 10 7月, 2013 1 次提交
  21. 04 7月, 2013 1 次提交
  22. 07 6月, 2013 1 次提交
  23. 06 6月, 2013 2 次提交
  24. 20 4月, 2013 1 次提交
  25. 06 4月, 2013 2 次提交
  26. 04 4月, 2013 2 次提交
  27. 21 3月, 2013 1 次提交
  28. 19 3月, 2013 1 次提交
  29. 15 3月, 2013 1 次提交
  30. 14 3月, 2013 2 次提交