Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ci

3 files changed, 57 insertions, 1 deletions

diff --git a/doc/install/installation.md b/doc/install/installation.md
index 4d85fb4..ba9c9ba 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -129,6 +129,9 @@ We recommend PostgreSQL but you can also use MySQL
     sudo -u gitlab_ci -H mkdir -p tmp/pids/
     sudo chmod -R u+rwX  tmp/pids/
 
+    # Make sure GitLab CI can write to the builds/ directory
+    sudo chmod -R u+rwX  builds
+
 ### Install gems
 
     # For MySQL (note, the option says "without ... postgres")
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index 73ca73e..3da3f26 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -2,7 +2,7 @@
 
 ## Create a backup of the GitLab CI
 
-A backup creates an archive file that contains the database.
+A backup creates an archive file that contains the database and builds files.
 This archive will be saved in backup_path (see `config/application.yml`).
 The filename will be `[TIMESTAMP]_gitlab_ci_backup.tar.gz`. This timestamp can be used to restore an specific backup.
 You can only restore a backup to exactly the same version of GitLab CI that you created it on, for example 7.10.1.
@@ -24,6 +24,8 @@ Example output:
 Dumping database ...
 Dumping PostgreSQL database gitlab_ci_development ... [DONE]
 done
+Dumping builds ...
+done
 Creating backup archive: 1430930060_gitlab_ci_backup.tar.gz ... done
 Uploading backup archive to remote storage  ... skipped
 Deleting tmp directories ... done
diff --git a/doc/update/7.12-to-7.13.md b/doc/update/7.12-to-7.13.md
new file mode 100644
index 0000000..e3600eb
--- /dev/null
+++ b/doc/update/7.12-to-7.13.md
@@ -0,0 +1,51 @@
+# Update from 7.12 to 7.13
+
+## Notice
+
+__GitLab CI 7.13 requires GitLab 7.12 or higher and GitLab Multi Runner 0.4.0 or higher
+
+### 1. Stop CI server
+
+    sudo service gitlab_ci stop
+
+### 2. Switch to your gitlab_ci user
+
+```
+sudo su gitlab_ci
+cd /home/gitlab_ci/gitlab-ci
+```
+
+### 3. Get latest code
+
+```
+git fetch
+git checkout 7-13-stable
+```
+
+### 4. Make sure GitLab CI can write to the builds/ directory
+
+```
+sudo chmod -R u+rwX  builds
+```
+
+### 5. Install libs, migrations etc
+
+
+```
+# Install nodejs dependency:
+sudo apt-get install nodejs
+
+# For MySQL users
+bundle install --without postgres development test --deployment
+
+# For Postgres users
+bundle install --without mysql development test --deployment
+
+# Run migrations
+bundle exec rake db:migrate RAILS_ENV=production
+```
+
+
+### 5. Start web application
+
+    sudo service gitlab_ci start