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

doc/update/2.6-to-3.0.md

@@ -13,6 +13,10 @@
 git fetch origin
 git checkout v3.0.3
 
+# 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 libs
 sudo -u gitlab bundle install --without development test postgres

doc/update/2.9-to-3.0.md

@@ -13,6 +13,11 @@
 sudo -u gitlab -H git fetch origin
 sudo -u gitlab -H git checkout v3.0.3
 
+# 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
 sudo -u gitlab -H bundle install --without development test postgres
 

doc/update/3.0-to-3.1.md

@@ -25,6 +25,11 @@ sudo -u gitlab -H git checkout v3.1.0
 # Install new charlock_holmes
 sudo gem install charlock_holmes --version '0.6.9'
 
+# 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 sqlite
 

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
 

doc/update/4.0-to-4.1.md

@@ -22,6 +22,11 @@ cd /home/gitlab/gitlab/
 sudo -u gitlab -H git fetch
 sudo -u gitlab -H git checkout 4-1-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
 

doc/update/4.1-to-4.2.md

@@ -17,7 +17,15 @@ sudo -u gitlab -H git fetch
 
 sudo -u gitlab -H git checkout 4-2-stable
 
-# Install libs
+# 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
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u gitlab -H bundle install --without development test postgres --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u gitlab -H bundle install --without development test postgres --deployment
 
 # update db

doc/update/4.2-to-5.0.md

@@ -85,8 +85,17 @@ sudo -u git -H cp config/gitlab.yml.example config/gitlab.yml
 # edit it
 sudo -u git -H vim config/gitlab.yml
 
+# 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 git -H vim Gemfile
 
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test postgres --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test postgres --deployment
+
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
 sudo -u git -H bundle exec rake gitlab:shell:setup RAILS_ENV=production
 sudo -u git -H bundle exec rake gitlab:shell:build_missing_projects RAILS_ENV=production

doc/update/5.0-to-5.1.md

@@ -42,7 +42,17 @@ cd /home/git/gitlab
 sudo rm tmp/sockets/gitlab.socket
 sudo -u git -H cp config/puma.rb.example config/puma.rb
 
+# 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 git -H vim Gemfile
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test postgres --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test postgres --deployment
+
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
 sudo -u git -H bundle exec rake migrate_merge_requests RAILS_ENV=production
 sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production

doc/update/5.1-to-5.2.md

@@ -40,12 +40,28 @@ sudo -u git -H git checkout v1.4.0
 ```bash
 cd /home/git/gitlab
 
+# 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 git -H vim Gemfile
+
 # MySQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test postgres --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test postgres --deployment
 
-#PostgreSQL
+# PostgreSQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test mysql --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test mysql --deployment
 
+# Both MySQL and PostgreSQL
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
 
 sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production

doc/update/5.1-to-5.4.md

@@ -37,12 +37,28 @@ sudo -u git -H git checkout v1.7.9 # Addresses multiple critical security vulner
 ```bash
 cd /home/git/gitlab
 
+# 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 git -H vim Gemfile
+
 # MySQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test postgres --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test postgres --deployment
 
-#PostgreSQL
+# PostgreSQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test mysql --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test mysql --deployment
 
+# Both MySQL and PostgreSQL
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
 
 sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production

doc/update/5.1-to-6.0.md

@@ -137,12 +137,28 @@ sudo apt-get install python-docutils
 ```bash
 cd /home/git/gitlab
 
+# 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 git -H vim Gemfile
+
 # MySQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test postgres --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test postgres --deployment
 
-#PostgreSQL
+# PostgreSQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test mysql --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test mysql --deployment
 
+# Both MySQL and PostgreSQL
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
 sudo -u git -H bundle exec rake migrate_groups RAILS_ENV=production
 sudo -u git -H bundle exec rake migrate_global_projects RAILS_ENV=production

doc/update/5.2-to-5.3.md

@@ -31,12 +31,28 @@ sudo -u git -H git checkout 5-3-stable
 ```bash
 cd /home/git/gitlab
 
+# 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 git -H vim Gemfile
+
 # MySQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test postgres --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test postgres --deployment
 
-#PostgreSQL
+# PostgreSQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test mysql --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test mysql --deployment
 
+# Both MySQL and PostgreSQL
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
 
 sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production

doc/update/5.3-to-5.4.md

@@ -35,12 +35,28 @@ sudo -u git -H git checkout v1.7.9 # Addresses multiple critical security vulner
 ```bash
 cd /home/git/gitlab
 
+# 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 git -H vim Gemfile
+
 # MySQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test postgres --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test postgres --deployment
 
-#PostgreSQL
+# PostgreSQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test mysql --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test mysql --deployment
 
+# Both MySQL and PostgreSQL
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
 
 sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production

doc/update/5.4-to-6.0.md

@@ -73,12 +73,28 @@ sudo apt-get install python-docutils
 ```bash
 cd /home/git/gitlab
 
+# 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 git -H vim Gemfile
+
 # MySQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test postgres --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test postgres --deployment
 
 # PostgreSQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test mysql --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test mysql --deployment
 
+# Both MySQL and PostgreSQL
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
 sudo -u git -H bundle exec rake migrate_groups RAILS_ENV=production
 sudo -u git -H bundle exec rake migrate_global_projects RAILS_ENV=production

doc/update/6.0-to-6.1.md

@@ -50,13 +50,28 @@ sudo -u git -H git checkout v1.7.9
 ```bash
 cd /home/git/gitlab
 
+# 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 git -H vim Gemfile
+
 # MySQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test postgres --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test postgres --deployment
 
-#PostgreSQL
-sudo -u git -H bundle install --without development test mysql --deployment
+# PostgreSQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test mysql --no-deployment
 
+# Install libs (with deployment this time)
+sudo -u git -H bundle install --without development test mysql --deployment
 
+# Both MySQL and PostgreSQL
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
 sudo -u git -H bundle exec rake migrate_iids RAILS_ENV=production
 sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production

doc/update/6.1-to-6.2.md

@@ -45,13 +45,28 @@ sudo apt-get install logrotate
 ```bash
 cd /home/git/gitlab
 
+# 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 git -H vim Gemfile
+
 # MySQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test postgres --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test postgres --deployment
 
-#PostgreSQL
-sudo -u git -H bundle install --without development test mysql --deployment
+# PostgreSQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test mysql --no-deployment
 
+# Install libs (with deployment this time)
+sudo -u git -H bundle install --without development test mysql --deployment
 
+# Both MySQL and PostgreSQL
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
 sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production
 sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production

doc/update/6.2-to-6.3.md

@@ -40,13 +40,28 @@ The gitlab-shell config changed recently, so check for config file changes and m
 ```bash
 cd /home/git/gitlab
 
+# 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 git -H vim Gemfile
+
 # MySQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test postgres --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test postgres --deployment
 
 # PostgreSQL
-sudo -u git -H bundle install --without development test mysql --deployment
 
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test mysql --no-deployment
+
+# Install libs (with deployment this time)
+sudo -u git -H bundle install --without development test mysql --deployment
 
+# Both MySQL and PostgreSQL
 # Run database migrations
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
 

doc/update/6.3-to-6.4.md

@@ -36,13 +36,28 @@ sudo -u git -H git checkout v1.8.0
 ```bash
 cd /home/git/gitlab
 
+# 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 git -H vim Gemfile
+
 # MySQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test postgres --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test postgres --deployment
 
 # PostgreSQL
-sudo -u git -H bundle install --without development test mysql --deployment
 
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test mysql --no-deployment
+
+# Install libs (with deployment this time)
+sudo -u git -H bundle install --without development test mysql --deployment
 
+# Both MySQL and PostgreSQL
 # Run database migrations
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
 

doc/update/6.4-to-6.5.md

@@ -46,13 +46,28 @@ sudo -u git -H git checkout v1.8.0
 ```bash
 cd /home/git/gitlab
 
-# MySQL installations (note: the line below states '--without ... postgres')
+# 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 git -H vim Gemfile
+
+# MySQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test postgres --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test postgres --deployment
 
-# PostgreSQL installations (note: the line below states '--without ... mysql')
-sudo -u git -H bundle install --without development test mysql --deployment
+# PostgreSQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test mysql --no-deployment
 
+# Install libs (with deployment this time)
+sudo -u git -H bundle install --without development test mysql --deployment
 
+# Both MySQL and PostgreSQL
 # Run database migrations
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
 

doc/update/6.5-to-6.6.md

@@ -46,12 +46,28 @@ sudo -u git -H git checkout v1.8.0
 ```bash
 cd /home/git/gitlab
 
-# MySQL installations (note: the line below states '--without ... postgres')
+# 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 git -H vim Gemfile
+
+# MySQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test postgres --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test postgres --deployment
 
-# PostgreSQL installations (note: the line below states '--without ... mysql')
+# PostgreSQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test mysql --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test mysql --deployment
 
+# Both MySQL and PostgreSQL
 
 # Run database migrations
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production

doc/update/6.6-to-6.7.md

@@ -46,13 +46,23 @@ sudo -u git -H git checkout v1.9.1
 ```bash
 cd /home/git/gitlab
 
-# MySQL installations (note: the line below states '--without ... postgres')
+# MySQL
+
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test postgres --no-deployment
+
+# Install libs (with deployment this time)
 sudo -u git -H bundle install --without development test postgres --deployment
 
-# PostgreSQL installations (note: the line below states '--without ... mysql')
-sudo -u git -H bundle install --without development test mysql --deployment
+# PostgreSQL
 
+# Run a bundle install without deployment to generate the new Gemfile
+sudo -u git -H bundle install --without development test mysql --no-deployment
+
+# Install libs (with deployment this time)
+sudo -u git -H bundle install --without development test mysql --deployment
 
+# Both MySQL and PostgreSQL
 # Run database migrations
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
 

doc/update/6.x-or-7.x-to-7.14.md

@@ -147,12 +147,15 @@ sudo -u git -H bundle install --without development test postgres --deployment
 # PostgreSQL installations (note: the line below states '--without ... mysql')
 sudo -u git -H bundle install --without development test mysql --deployment
 
-# Run database migrations
-sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
+# Run database migrations from 6.0 to 6.1
+sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production VERSION=20130909132950
 
 # Enable internal issue IDs (introduced in GitLab 6.1)
 sudo -u git -H bundle exec rake migrate_iids RAILS_ENV=production
 
+# Run left database migrations
+sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
+
 # Clean up assets and cache
 sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production