An error occurred fetching the project authors.
  1. 19 Mar, 2014 1 commit
    • 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
  2. 24 Feb, 2014 1 commit
  3. 23 Jan, 2014 1 commit
  4. 22 Jan, 2014 1 commit
  5. 01 Jan, 2014 1 commit
  6. 26 Dec, 2013 1 commit
  7. 09 Oct, 2013 1 commit
  8. 11 Sep, 2013 1 commit
  9. 18 Jul, 2013 3 commits
    • 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 multiple fixes · 489fa5d7
      Izaak Alpert authored
      -Disable observers post test run
      -Allow db:seed_fu RAILS_ENV=test to be run more than once without error
      -fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned
      -make notes/commits render against proper project
      -MR discussion file links should reference note's project
      -Added tests for commit links on edit merge request
      -fixes edit issues (canceling an edited mr, updating an edited mr)
      -updates tests with checks for source code updates
      -still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set)
      
      MR API: error on bad target_project
      
      -If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target
      -Fixes some busted (but hidden) test cases
      
      Conflicts:
      	app/views/merge_requests/show/_diffs.html.haml
      	spec/features/notes_on_merge_requests_spec.rb
      
      Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
      489fa5d7
    • 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
  10. 10 Jul, 2013 2 commits
  11. 01 Jul, 2013 1 commit
  12. 11 Apr, 2013 1 commit
  13. 10 Apr, 2013 1 commit
  14. 01 Apr, 2013 1 commit
  15. 28 Mar, 2013 1 commit
  16. 19 Mar, 2013 1 commit
  17. 21 Feb, 2013 4 commits
  18. 31 Jan, 2013 1 commit
  19. 15 Jan, 2013 2 commits
  20. 14 Jan, 2013 1 commit
  21. 05 Jan, 2013 1 commit