14 Mar, 2014

1 commit

11 Mar, 2014

1 commit

28 Feb, 2014

1 commit

20 Feb, 2014

1 commit

01 Jan, 2014

1 commit

31 Dec, 2013

2 commits

30 Dec, 2013

1 commit

14 Dec, 2013

1 commit

23 Oct, 2013

1 commit

21 Oct, 2013

1 commit

12 Aug, 2013

1 commit

30 Jul, 2013

1 commit

18 Jul, 2013

1 commit

17 Jul, 2013

1 commit

  • 489fa5d7   MR on Fork multiple fixes ... Browse Dir » 
    -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
     

14 Jul, 2013

1 commit

13 Jul, 2013

1 commit

12 Jul, 2013

1 commit

23 Jun, 2013

1 commit