diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:47:36 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:47:36 +0200 |
| commit | c993481d991333fe0750080eec98fd2e9eeda8d5 (patch) | |
| tree | 7d1fdd7926f8542b7fbf7add052004dbfd48b206 /doc/update | |
| parent | 83f04853e9a749c3397ee7683a78b986e1070904 (diff) | |
| parent | 123669a55107514798ba531ba3a744b3ec8503ee (diff) | |
| download | gitlab-ce-git-archive-golang.tar.gz | |
Merge branch 'master' into git-archive-golanggit-archive-golang
Diffstat (limited to 'doc/update')
| -rw-r--r-- | doc/update/7.14-to-8.0.md | 13 | ||||
| -rw-r--r-- | doc/update/patch_versions.md | 6 |
2 files changed, 15 insertions, 4 deletions
diff --git a/doc/update/7.14-to-8.0.md b/doc/update/7.14-to-8.0.md index 0e65c32098c..7ad4935e839 100644 --- a/doc/update/7.14-to-8.0.md +++ b/doc/update/7.14-to-8.0.md @@ -175,12 +175,21 @@ Also note that because Apache does not support upstreams behind Unix sockets you Now, GitLab CE and EE has CI integrated. However, migrations don't happen automatically and you need to do it manually. Please follow the following guide [to migrate](../migrate_ci_to_ce/README.md) your GitLab CI instance to GitLab CE/EE. -### 10. Start application +### 10. Use Redis v2.4.0+ + +Previous versions of GitLab allowed Redis versions >= 2.0 to be used, but +Sidekiq jobs could fail due to lack of support for the SREM command. GitLab +8.0 now checks that Redis >= 2.4.0 is used. You can check your Redis version +with the following command: + + redis-cli info | grep redis_version + +### 11. Start application sudo service gitlab start sudo service nginx restart -### 11. Check application status +### 12. Check application status Check if GitLab and its environment are configured correctly: diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md index a66a863f6c4..da719229ab6 100644 --- a/doc/update/patch_versions.md +++ b/doc/update/patch_versions.md @@ -23,9 +23,11 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production cd /home/git/gitlab sudo -u git -H git fetch --all sudo -u git -H git checkout -- Gemfile.lock db/schema.rb -LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`) -sudo -u git -H git checkout $LATEST_TAG -b $LATEST_TAG +sudo -u git -H git checkout LATEST_TAG -b LATEST_TAG ``` +Replace `LATEST_TAG` with the latest GitLab tag you want to update to, for example `v8.0.3`. +Use `git tag -l 'v*.[0-9]' --sort='v:refname'` to see a list of all tags. +Make sure to update patch versions only (check your current version with `cat VERSION`) ### 3. Update gitlab-shell to the corresponding version |