06 Nov, 2013

1 commit


29 Oct, 2013

2 commits


16 Oct, 2013

4 commits


14 Oct, 2013

1 commit


10 Oct, 2013

2 commits


09 Oct, 2013

1 commit


08 Oct, 2013

1 commit


07 Oct, 2013

2 commits


01 Oct, 2013

1 commit


30 Sep, 2013

2 commits


29 Sep, 2013

3 commits


24 Sep, 2013

1 commit


23 Sep, 2013

1 commit


22 Sep, 2013

1 commit


13 Sep, 2013

1 commit


11 Sep, 2013

2 commits


09 Sep, 2013

2 commits


05 Sep, 2013

1 commit


04 Sep, 2013

1 commit


27 Aug, 2013

3 commits


25 Aug, 2013

1 commit


14 Aug, 2013

1 commit


08 Aug, 2013

1 commit


30 Jul, 2013

2 commits


17 Jul, 2013

2 commits

  • -Made the api method a little more readable
    -removed some missed extra newline's
    
    Change-Id: Ic38baafc813aaeda0a8b283f39916182c8ec37d5
    Izaak Alpert
     
  • -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
    Izaak Alpert