I don't have any guidance on this Jay, sorry. On Wed, Jul 23, 2014 at 5:11 PM, Jay Fitz <[email protected]> wrote: > Hello, I've been wrestling with the problem of how to get merge requests > into a newer version of gitlab. Our current server is on 5.0.1 and I'm > building a new instance on a new server. Trying to migrate to v7 but in > debugging this particular problem, I've been experimenting with just moving > to 5.1 > > Part of the migration process from 5.0 to 5.1 is this command sudo -u git -H > bundle exec rake migrate_merge_requests RAILS_ENV=production which > essentially just runs this file > https://github.com/gitlabhq/gitlabhq/blob/5-1-stable/lib/tasks/migrate/migrate_mr.rake > it pretty much just empties the st_commits table. > > If I run that, then I can view unmerged merge requests just fine, but old > merge requests will show either "nothing to merge" or something along the > lines of "cannot render merge XXXXX cannot find branch. > > If I don't run that, then I get a 500 error any time I try to view any merge > request with this appearing in production.log > > Started GET "/project/branch/merge_requests" for at 2014-07-23 16:02:33 > +0100 > Processing by MergeRequestsController#index as HTML > Parameters: {"project_id"=>"project/branch"} > Rendered merge_requests/_filter.html.haml (3.3ms) > Rendered merge_requests/_merge_request.html.haml (12.0ms) > Rendered merge_requests/index.html.haml within layouts/project_resource > (226.0ms) > Completed 500 Internal Server Error in 726ms > > ActionView::Template::Error (undefined method `id' for nil:NilClass): > 18: - if merge_request.notes.any? > 19: %span > 20: %i.icon-comments > 21: = merge_request.mr_and_commit_notes.count > 22: - if merge_request.milestone_id? > 23: %span > 24: %i.icon-time > app/models/commit.rb:24:in `id' > lib/gitlab/git/commit.rb:107:in `init_from_grit' > lib/gitlab/git/commit.rb:21:in `initialize' > app/models/merge_request.rb:213:in `new' > app/models/merge_request.rb:213:in `block in load_commits' > app/models/merge_request.rb:213:in `map' > app/models/merge_request.rb:213:in `load_commits' > app/models/merge_request.rb:145:in `commits' > app/models/merge_request.rb:184:in `mr_and_commit_notes' > app/views/merge_requests/_mer > > I've found this piece of code that supposedly fixes the problem > https://gist.github.com/bladealslayer/6448104 but I've tried running that > before and after the migrate db and before, after and instead of the migrate > mr rake, but it doesn't seem to make any difference. > > Now, the gitlab docs say that the loss of merge requests cannot be > prevented. Except that I have a working instance where my colleague migrated > from the same server to a new 6.4 server and retained the data. > Unfortunately (and here's the bit that really sucks) we've been unable to > replicate the process so far. > > So, how do I get from 5 to 5.1 while still retaining merge request info? > getting to 7 after that is easy, it's just the first step that's killing me. > > -- > 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 [email protected]. > To view this discussion on the web visit > https://groups.google.com/d/msgid/gitlabhq/4aabadd4-97dd-4948-bfde-805c7d5b727e%40googlegroups.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 [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/gitlabhq/CAEG31mM-3pbqbW4fWfXuonQLvCK6YSqCbwA0RcY6HtB0wrXNzg%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.
