Thanks! On Tue, May 6, 2014 at 9:18 AM, Bram Klein Gunnewiek <bram...@gmail.com> wrote: > I removed the entry from the table forked_project_links and that solved my > problem. I made a feature request here: > http://feedback.gitlab.com/forums/176466-general/suggestions/5890100-ability-to-select-the-default-merge-target-for-pro > > > 2014-05-05 21:26 GMT+02:00 Sytse Sijbrandij <sy...@gitlab.com>: > >> I agree that this would solve your problem, but you would have to >> create this function yourself or use the rails console to edit the db >> (which is dangerous). Feel free to submit a feature request to be able >> to edit and delete the upstream repo. >> >> On Mon, May 5, 2014 at 6:10 PM, Bram Klein Gunnewiek <bram...@gmail.com> >> wrote: >> > Well, what I want is that gitlab does not pick the parent repository as >> > default merge target but the master branch of the forked repository but >> > that >> > is not possible. So, If I somehow remove the link from the forked >> > repository >> > (in the sql database?) and make it a "normal" repository it would also >> > solve >> > my problem I guess. >> > >> > >> > 2014-05-05 18:08 GMT+02:00 Sytse Sijbrandij <sy...@gitlab.com>: >> > >> >> You want to change a repo from forked to normal? Not sure how to do >> >> this apart from recreating the project (and losing all issues). >> >> >> >> On Mon, May 5, 2014 at 4:42 PM, Bram Klein Gunnewiek >> >> <bram...@gmail.com> >> >> wrote: >> >> > Is there a way to configure the forked branch so that gitlab sees it >> >> > as >> >> > a >> >> > normal branch? We forked the branch because we wanted to split two >> >> > parts >> >> > of >> >> > our application into a separate application and library, the forked >> >> > branch >> >> > will never get merged into the original branch and will continue to >> >> > live >> >> > as >> >> > a normal branch. >> >> > >> >> > >> >> > 2014-05-05 16:32 GMT+02:00 Sytse Sijbrandij <sy...@gitlab.com>: >> >> >> >> >> >> We changed the standard behavior, these is no setting to change it. >> >> >> >> >> >> On Mon, May 5, 2014 at 3:50 PM, Bram <bram...@gmail.com> wrote: >> >> >> > The subject might be a bit cryptic but I didn't know how to >> >> >> > explain >> >> >> > it. >> >> >> > Since our upgrade to 6.7 (and now 6.8) the merge requests for a >> >> >> > forked >> >> >> > repository in our gitlab set-up automatically want to merge into >> >> >> > the >> >> >> > original repository it was forked from. We don't want that, we >> >> >> > need >> >> >> > gitlab >> >> >> > to merge into the master branch of the forked repository. This >> >> >> > behaviour >> >> >> > changed since our upgrade to 6.7 but I can't find any setting to >> >> >> > revert >> >> >> > this. >> >> >> > >> >> >> > Can someone explain to me how I do this? >> >> >> > >> >> >> > -- >> >> >> > You received this message because you are subscribed to the Google >> >> >> > Groups >> >> >> > "GitLab" group. >> >> >> > To unsubscribe from this group and stop receiving emails from it, >> >> >> > send >> >> >> > an >> >> >> > email to gitlabhq+unsubscr...@googlegroups.com. >> >> >> > For more options, visit https://groups.google.com/d/optout. >> >> >> >> >> >> -- >> >> >> You received this message because you are subscribed to a topic in >> >> >> the >> >> >> Google Groups "GitLab" group. >> >> >> To unsubscribe from this topic, visit >> >> >> https://groups.google.com/d/topic/gitlabhq/b7ildO7w6Ug/unsubscribe. >> >> >> To unsubscribe from this group and all its topics, send an email to >> >> >> gitlabhq+unsubscr...@googlegroups.com. >> >> >> >> >> >> For more options, visit https://groups.google.com/d/optout. >> >> > >> >> > >> >> > -- >> >> > You received this message because you are subscribed to the Google >> >> > Groups >> >> > "GitLab" group. >> >> > To unsubscribe from this group and stop receiving emails from it, >> >> > send >> >> > an >> >> > email to gitlabhq+unsubscr...@googlegroups.com. >> >> > For more options, visit https://groups.google.com/d/optout. >> >> >> >> -- >> >> You received this message because you are subscribed to a topic in the >> >> Google Groups "GitLab" group. >> >> To unsubscribe from this topic, visit >> >> https://groups.google.com/d/topic/gitlabhq/b7ildO7w6Ug/unsubscribe. >> >> To unsubscribe from this group and all its topics, send an email to >> >> gitlabhq+unsubscr...@googlegroups.com. >> >> For more options, visit https://groups.google.com/d/optout. >> > >> > >> > -- >> > You received this message because you are subscribed to the Google >> > Groups >> > "GitLab" group. >> > To unsubscribe from this group and stop receiving emails from it, send >> > an >> > email to gitlabhq+unsubscr...@googlegroups.com. >> > For more options, visit https://groups.google.com/d/optout. >> >> -- >> You received this message because you are subscribed to a topic in the >> Google Groups "GitLab" group. >> To unsubscribe from this topic, visit >> https://groups.google.com/d/topic/gitlabhq/b7ildO7w6Ug/unsubscribe. >> To unsubscribe from this group and all its topics, send an email to >> gitlabhq+unsubscr...@googlegroups.com. >> For more options, visit https://groups.google.com/d/optout. > > > -- > You received this message because you are subscribed to the Google Groups > "GitLab" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to gitlabhq+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/d/optout.
-- You received this message because you are subscribed to the Google Groups "GitLab" group. To unsubscribe from this group and stop receiving emails from it, send an email to gitlabhq+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
