-
Notifications
You must be signed in to change notification settings - Fork 5.8k
Merge Request on forked projects #4051
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
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 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: - Satellites always always recreate - 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) Change-Id: I5502883b8b57df7fe16dc7253db20e5ca7b7f702
|
So this one I've fixed some of the things i mentioned before and added some tests around merge_action and action. |
|
+1 By allowing you to submit merge requests cross-repo back to the fork origin, this should close the loop on forking workflow. See #3597 |
|
Little bit surprised that coverage remained the same -- i expected with the new tests around merge_action the coverage would go up. |
|
Specifically addresses: #3597 (comment) |
|
Tests run pretty slow with all the additional satellite creation, looking into preventing these from running before every test. |
|
👍 Nice feature! This morning I've tried if I could fork and than make a pull request but sadly that was not possible. |
|
@MasterExplosive -- just checking -- you didn't find an issue with this PR did you? |
-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 Change-Id: I01b0e1b8f9ba1200c4ad58bfea132af0e499320b
|
This should speed up the test satellite creation quite a bit. |
Change-Id: Iaa13c37f4cfd01083e2a5c297cc06896d84659d1
|
It seems i completely broke the travis build with that last one, this should fix it (our own ci server -- jenkins must be slightly more lazy). |
|
Looking into that failing NotificationService test now, had enabled some observers, and didn't disable them afterwards |
Change-Id: Ic1c2764e23e07195f0d69a5dcaec394001bf1c3e
|
Added some comments from our own code review system - will take care of these as i get to them. |
|
Additionally found errors with editing merge requests, and retrieving diff's on forked MR's |
|
will this pull request implement the updating of the project you forked from the original one? |
|
@shidokun this functionality works now (there are issues, but it basically works; i.e. if you want you can test it yourself). You mean making merge requests to projects that have forked from you? It doesn't support that right now, but typically as the manager of a fork you'd be a consumer of the upstream, and be pulling and updating manually. This is something that could be done eventually, but i'd find it's value a little hard to justify, because at that point (which seems like a bit of an edge case) you can just fork the fork, and start making merge requests on that. Regardless of my opinion, it doesn't do the above currently, but adding that kind of functionality after this change would be much easier. |
|
is it under master? currently im using 5.2 though i mean example i was finding that feature and i think its called pull request... |
|
You would have to pull it yourself -- it's still very much in "beta". I've got some more patches for it coming. It really just allows for merge requests on projects you've forked -- just like git hub. I do like your ideas I think they need this function first tough. |
|
though i remember.. though its better if will be merge function with the merge request |
|
I can't find that function on github, and always update my github repos by deleteing the branch i want to update and pushing the latest there. How are you doing this? In anycase this is a different problem. |
|
I'm going to close this and reopen it with all the fixes, rather then apply the fixes individually, hopefully this makes life easier for the mergers. |
The good:
The questionable:
The bad:
(for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos)
Change-Id: I5502883b8b57df7fe16dc7253db20e5ca7b7f702