1. 03 Aug, 2016 1 commit
  2. 30 Jun, 2016 1 commit
  3. 21 Jun, 2016 1 commit
  4. 03 Jun, 2016 2 commits
  5. 26 May, 2016 1 commit
  6. 04 May, 2016 1 commit
  7. 08 Jan, 2016 1 commit
  8. 02 Dec, 2015 1 commit
  9. 17 Sep, 2015 1 commit
  10. 07 Sep, 2015 1 commit
  11. 30 Apr, 2015 1 commit
  12. 14 Sep, 2014 1 commit
  13. 08 Sep, 2014 1 commit
  14. 11 Aug, 2014 1 commit
  15. 15 Jul, 2014 1 commit
  16. 21 Jun, 2014 1 commit
  17. 29 May, 2014 2 commits
  18. 26 Mar, 2014 1 commit
  19. 05 Feb, 2014 3 commits
  20. 31 Dec, 2013 1 commit
  21. 12 Sep, 2013 1 commit
    • Dmitriy Zaporozhets's avatar
      Compare page improved · f774949d
      Dmitriy Zaporozhets authored
      * Show new merge request button from compare page
      * Show message if user selected same branches
      * Show message if compared branches are the same
      * Prepend inputs with from/to labels
      f774949d
  22. 09 Aug, 2013 2 commits
  23. 29 Jul, 2013 1 commit
  24. 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
  25. 13 Jul, 2013 3 commits
  26. 23 Jun, 2013 1 commit
  27. 01 Apr, 2013 1 commit
  28. 20 Mar, 2013 1 commit
  29. 08 Jan, 2013 1 commit
  30. 18 Dec, 2012 1 commit
  31. 26 Sep, 2012 1 commit
    • Robert Speicher's avatar
      Compare views and cleanup · b462a133
      Robert Speicher authored
      - Remove compare/_head and just use commits/_head since they're identical
      - Add index view; extract the form into a partial
      b462a133