1. 14 Dec, 2017 1 commit
  2. 02 Jun, 2017 1 commit
  3. 09 Aug, 2016 1 commit
  4. 03 Jun, 2016 2 commits
  5. 24 May, 2016 1 commit
  6. 23 May, 2016 1 commit
  7. 30 Mar, 2016 1 commit
  8. 11 Apr, 2015 1 commit
  9. 12 Feb, 2015 1 commit
  10. 18 Jul, 2013 3 commits
    • Izaak Alpert's avatar
      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
    • Izaak Alpert's avatar
      MR on fork: Email fixes, style fixes · 0ef055a4
      Izaak Alpert authored
      -Removed many extra spaces I added
      -Fixed email templates to be consistent/better looking
      GITLAB-894, GITLAB-895, (GITLAB-858)
      Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e
    • 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)
      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
  11. 17 Feb, 2013 1 commit
  12. 03 Oct, 2012 1 commit
  13. 25 Sep, 2012 1 commit
  14. 06 Sep, 2012 1 commit
  15. 02 Sep, 2012 1 commit
  16. 29 Aug, 2012 2 commits