BigW Consortium Gitlab

  1. 09 Apr, 2015 1 commit
  2. 25 Mar, 2015 1 commit
  3. 22 Feb, 2015 1 commit
  4. 03 Feb, 2015 1 commit
  5. 03 Oct, 2014 1 commit
  6. 22 Aug, 2014 1 commit
  7. 14 Jul, 2014 1 commit
  8. 05 May, 2014 1 commit
  9. 11 Apr, 2014 1 commit
  10. 09 Apr, 2014 1 commit
  11. 22 Mar, 2014 2 commits
  12. 25 Feb, 2014 1 commit
  13. 19 Nov, 2013 1 commit
  14. 29 Jul, 2013 1 commit
  15. 18 Jul, 2013 3 commits
    • Refactor merge api create · fae3f466
      Izaak Alpert authored
      -Made the api method a little more readable
      -removed some missed extra newline's
      
      Change-Id: Ic38baafc813aaeda0a8b283f39916182c8ec37d5
    • Style changes from review with @randx · d9959427
      Izaak Alpert authored
      -Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow
      
      Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
    • 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
  16. 26 Jun, 2013 1 commit
  17. 17 Mar, 2013 1 commit
  18. 04 Feb, 2013 1 commit
  19. 29 Jan, 2013 1 commit
  20. 28 Jan, 2013 1 commit
  21. 16 Jan, 2013 1 commit
  22. 05 Jan, 2013 1 commit
  23. 22 Dec, 2012 1 commit
  24. 21 Nov, 2012 1 commit
  25. 26 Oct, 2012 1 commit
  26. 25 Oct, 2012 3 commits