diff options
| author | Izaak Alpert <ihalpert@blackberry.com> | 2013-04-25 10:15:33 -0400 |
|---|---|---|
| committer | Izaak Alpert <ialpert@blackberry.com> | 2013-07-17 22:41:30 -0400 |
| commit | 3d7194f0112da12e8732df9ffe8b34fe7d0a9f6b (patch) | |
| tree | 9b3c68c04b5ead5e35456595a07453b036b2dbc8 /features/steps/group | |
| parent | fd033671933fcc0f472480d98c907aefde357416 (diff) | |
| download | gitlab-ce-3d7194f0112da12e8732df9ffe8b34fe7d0a9f6b.tar.gz | |
Merge Request on forked projects
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
Diffstat (limited to 'features/steps/group')
| -rw-r--r-- | features/steps/group/group.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/features/steps/group/group.rb b/features/steps/group/group.rb index a6b9aa606c6..6f18f6185f5 100644 --- a/features/steps/group/group.rb +++ b/features/steps/group/group.rb @@ -60,7 +60,8 @@ class Groups < Spinach::FeatureSteps Given 'project from group has merge requests assigned to me' do create :merge_request, - project: project, + source_project: project, + target_project: project, assignee: current_user, author: current_user end |