17 Jul, 2013

1 commit

  • 3d7194f0   Merge Request on forked projects ... Browse Dir » 
    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
    Izaak Alpert
     

16 Jul, 2013

4 commits

12 Jul, 2013

4 commits

11 Jul, 2013

4 commits

10 Jul, 2013

2 commits

08 Jul, 2013

4 commits

07 Jul, 2013

1 commit

06 Jul, 2013

1 commit

03 Jul, 2013

1 commit

26 Jun, 2013

1 commit

25 Jun, 2013

1 commit

24 Jun, 2013

1 commit

23 Jun, 2013

1 commit

22 Jun, 2013

3 commits

21 Jun, 2013

1 commit

20 Jun, 2013

1 commit

19 Jun, 2013

2 commits

18 Jun, 2013

1 commit

14 Jun, 2013

1 commit

12 Jun, 2013

4 commits

11 Jun, 2013

1 commit