1. 27 Nov, 2013 1 commit
  2. 23 Nov, 2013 1 commit
  3. 20 Nov, 2013 1 commit
  4. 19 Nov, 2013 1 commit
  5. 11 Nov, 2013 1 commit
  6. 08 Nov, 2013 1 commit
  7. 06 Nov, 2013 1 commit
  8. 05 Nov, 2013 2 commits
  9. 31 Oct, 2013 2 commits
  10. 24 Oct, 2013 1 commit
  11. 21 Oct, 2013 1 commit
  12. 10 Oct, 2013 2 commits
  13. 23 Sep, 2013 1 commit
  14. 13 Sep, 2013 1 commit
  15. 09 Sep, 2013 1 commit
  16. 07 Sep, 2013 1 commit
    • Boyan Tabakov's avatar
      Improved large commit handling. · aaa52ea900f8
      Boyan Tabakov authored
      Previously, only number of changed files mattered. Now, number of lines to render in the diff are also taken into account.
      
      A hard limit is set, above which diffs are not rendered and users are not allowed to override that. This prevents high server
      resource usage with huge commits.
      
      Related to #1745, #2259
      
      In addition, handle large commits for MergeRequests and Compare controllers.
      
      Also fixes a bug where diffs are loaded twice, if user goes directly to merge_requests/:id/diffs URL.
      aaa52ea900f8
  17. 15 Aug, 2013 1 commit
  18. 14 Aug, 2013 1 commit
  19. 13 Aug, 2013 1 commit
  20. 12 Aug, 2013 1 commit
  21. 10 Aug, 2013 1 commit
  22. 08 Aug, 2013 1 commit
  23. 07 Aug, 2013 2 commits
  24. 06 Aug, 2013 1 commit
  25. 18 Jul, 2013 2 commits
    • Izaak Alpert's avatar
      Style changes from review with @randx · fb3ca7b97aa6
      Izaak Alpert authored
      -Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow
      
      Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
      fb3ca7b97aa6
    • Izaak Alpert's avatar
      Merge Request on forked projects · b4f243f95099
      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
      b4f243f95099
  26. 04 Jul, 2013 1 commit
  27. 21 Jun, 2013 1 commit
  28. 20 Jun, 2013 1 commit
  29. 19 Jun, 2013 1 commit
  30. 17 Jun, 2013 1 commit
  31. 14 Jun, 2013 1 commit
  32. 16 May, 2013 2 commits
  33. 14 May, 2013 2 commits