summaryrefslogtreecommitdiff
path: root/doc/update/3.1-to-4.0.md
diff options
context:
space:
mode:
authorDrew Blessing <drew@blessing.io>2016-06-22 21:29:59 +0000
committerDrew Blessing <drew@blessing.io>2016-06-22 21:29:59 +0000
commit9487dd3a40b99c9e42a46885ecc60ebedc34f637 (patch)
tree1342aab797496ef13ceba98d6796d9fe77b26a4b /doc/update/3.1-to-4.0.md
parentcb0283d218bd813777290ea72e08fb2fcc40ab47 (diff)
parent2538c4ec8ae0243b5b697f0a70740cc32df50b35 (diff)
downloadgitlab-ce-9487dd3a40b99c9e42a46885ecc60ebedc34f637.tar.gz
Merge branch 'fix_upgrade_docs' into 'master'
Update docs based on customer upgrade from 4.0 ## What does this MR do? Adds helpful notes to early upgrade docs. Without these helpful hints it will be really hard for most people to upgrade from early versions to later versions. The tip about doing database migrations to version 6.1, then migrating iids, then migrating the database all the way was based on a tip from https://github.com/gitlabhq/gitlabhq/issues/7869. It worked really well! See merge request !4409
Diffstat (limited to 'doc/update/3.1-to-4.0.md')
-rw-r--r--doc/update/3.1-to-4.0.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/update/3.1-to-4.0.md b/doc/update/3.1-to-4.0.md
index f1ef4df4744..df53ed6de83 100644
--- a/doc/update/3.1-to-4.0.md
+++ b/doc/update/3.1-to-4.0.md
@@ -26,6 +26,11 @@ I wrote a bash script which will do it automatically for you. Just make sure all
sudo -u gitlab -H git fetch
sudo -u gitlab -H git checkout 4-0-stable
+# The Modernizr gem was yanked from RubyGems. It is required for GitLab >= 2.8.0
+# Edit `Gemfile` and change `gem "modernizr", "2.5.3"` to
+# `gem "modernizr-rails", "2.7.1"``
+sudo -u gitlab -H vim Gemfile
+
# Install gems for MySQL
sudo -u gitlab -H bundle install --without development test postgres