Need help with upgrading Bitnami Gitlab 8.8.4, got errors

connal.mcsims 2017-08-14 16:23:05 UTC #1

IMPORTANT, please fill the questions

We assume you are using Bitnami to deploy your application.

Which version of the application are you using?: Bitnami Gitlab 8.8.4
Please choose how you got the application: Installer (Windows, Linux, macOS), cloud image (AWS, GCE, Azure, ...) or VM (VMDK, VBOX): linux installer
Have you installed any plugin or modified any configuration file?: No
Describe here your question/suggestion/issue (expected and actual results):
Hello all . Could you help with upgrading my Gitlab? Ive trying to upgrade by this manual https://docs.bitnami.com/installer/apps/gitlab-legacy/#how-to-upgrade-gitlab but when im entering
git checkout v9.4.4
git stash pop
i`ve got errors
Gemfile: needs merge
app/helpers/commits_helper.rb: needs merge
config/database.yml.postgresql: needs merge
config/gitlab.yml.example: needs merge
config/resque.yml.example: needs merge
lib/tasks/gitlab/check.rake: needs merge

Ive tried to use mergetool, but im newbie in this

Steps to reproduce the issue (if relevant):
Copy the apache log (if relevant):
```
PASTE HERE
```

jsalmeron 2017-08-15 08:12:34 UTC #2

Hi,

Could you show the conflicting parts of these files? We could help you see which parts should be adapted.

Best regards,

Javier J. Salmerón

Was my answer helpful? Click on

connal.mcsims 2017-08-16 07:41:03 UTC #3

Hi, thank you for your attention
here listing of my console

git stash pop
Autolink lib / tasks / gitlab / check.rake
CONFLICT (content): Conflict in lib / tasks / gitlab / check.rake
CONFLICT (change / delete): config / resque.yml.example is removed in Stashed changes and changed to Updated upstream. The updated upstream version of config / resque.yml.example is left in the tree.
CONFLICT (change / delete): config / gitlab.yml.example is removed in Stashed changes and changed to Updated upstream. Updated upstream version of config / gitlab.yml.example is left in the tree.
Auto config / environments / production.rb
CONFLICT (change / delete): config / database.yml.postgresql is removed in Stashed changes and changed to Updated upstream. The updated upstream version of config / database.yml.postgresql is left in the tree.
Auto-app app / helpers / commits_helper.rb
CONFLICT (content): The merge conflict in app / helpers / commits_helper.rb
Auto-Gemfile
CONFLICT (content): Conflict in Gemfile
Warning: inexact rename detection was skipped due to too many files.
Warning: you may want to set your merge.renamelimit to 7336 and retry the command.

what can i do in this situation?

silvio 2017-08-16 10:07:50 UTC #4

Hi,

In this case you can find detailed a much simpler method to upgrade your Gitlab installation. We changed the way we shipped Gitlab and now is much easier.

Hope it helps.

If you have any other question and you think we can help, please don’t hesitate to ask.

Best regards,
Silvio Fernández

connal.mcsims 2017-08-16 11:31:57 UTC #5

o, thank you very much, i hope it helps me

connal.mcsims 2017-08-16 11:55:03 UTC #6

Hi again, could you tell me one more thing? In that topic wrote that i need to do backup of gitlab data, this backup i need to do by bundle exec rake gitlab:backup or by taring all?

silvio 2017-08-17 07:15:16 UTC #7

Hi,

In this guide you can find how to do a backup of your Gitlab stack, it basically consists in tar all.

Hope it helps.

Best regards,
Silvio Fernández

Bitnami provides free all-in-one installers, virtual machines and cloud images for popular open source applications. Get them now!