1. 23 May, 2014 1 commit
  2. 19 Mar, 2014 2 commits
    • Robert Speicher's avatar
      65d63470
    • Robert Speicher's avatar
      Speed up features/notes_on_merge_requests_spec · 53d3294d
      Robert Speicher authored
      This spec featured the slowest tests in the entire suite. After some
      debugging, the cause was found to be the large commit diff generated by
      comparing the stable and master branches.
      
      To fix this, the seed repository was modified to create a simple branch
      off of master that consists of three simple commits and minor changes.
      The spec was then updated to compare master to this branch instead of
      stable. The result is a spec group that runs in under 30 seconds, down
      from about 90.
      53d3294d
  3. 23 Feb, 2014 1 commit
  4. 14 Feb, 2014 1 commit
    • Jason Hollingsworth's avatar
      Add email aliases for users · 29cfd33d
      Jason Hollingsworth authored
      Emails are used to associate commits with users. The emails
      are not verified and don't have to be valid email addresses. They
      are assigned on a first come, first serve basis.
      
      Notifications are sent when an email is added.
      29cfd33d
  5. 11 Feb, 2014 1 commit
  6. 23 Jan, 2014 1 commit
  7. 22 Jan, 2014 1 commit
  8. 25 Nov, 2013 1 commit
  9. 12 Nov, 2013 1 commit
  10. 17 Oct, 2013 1 commit
  11. 15 Oct, 2013 1 commit
  12. 26 Sep, 2013 1 commit
  13. 13 Sep, 2013 1 commit
  14. 18 Jul, 2013 4 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
      d9959427
    • Izaak Alpert's avatar
      Rebased on 6.0 · 128f2845
      Izaak Alpert authored
      -Had to do some minor test clean up as well
      
      Change-Id: I8f378f1b5fe676d73b8691e870c11ca6def90cbf
      128f2845
    • 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
      0ef055a4
    • 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
  15. 01 Jul, 2013 1 commit
  16. 22 Jun, 2013 3 commits
  17. 06 May, 2013 1 commit
  18. 10 Apr, 2013 1 commit
  19. 03 Apr, 2013 1 commit
  20. 01 Apr, 2013 4 commits
  21. 24 Mar, 2013 2 commits
  22. 28 Feb, 2013 2 commits
  23. 18 Feb, 2013 3 commits
  24. 17 Feb, 2013 1 commit
  25. 13 Feb, 2013 1 commit
  26. 12 Feb, 2013 1 commit
  27. 28 Jan, 2013 1 commit