summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Bodenmiller <bbodenmiller@hotmail.com>2014-08-23 01:43:26 -0700
committerRobert Schilling <rschilling@student.tugraz.at>2014-08-23 12:14:22 +0200
commit935ed64bc0c7414c59d141f1850ee9167529255c (patch)
tree8f0c9c5f85461b62efed8d6c38392572afc42111
parente4f6025d297ed613974d4b7f9126e81457deae0c (diff)
downloadgitlab-ce-935ed64bc0c7414c59d141f1850ee9167529255c.tar.gz
clarify which configs should be updated
-rw-r--r--doc/update/7.1-to-7.2.md10
1 files changed, 8 insertions, 2 deletions
diff --git a/doc/update/7.1-to-7.2.md b/doc/update/7.1-to-7.2.md
index 68647cb5113..408ed42cdbb 100644
--- a/doc/update/7.1-to-7.2.md
+++ b/doc/update/7.1-to-7.2.md
@@ -41,7 +41,7 @@ For GitLab Enterprise Edition:
sudo -u git -H git checkout 7-2-stable-ee
```
-### 3. Update gitlab-shell (and its config)
+### 3. Update gitlab-shell
```bash
cd /home/git/gitlab-shell
@@ -84,12 +84,18 @@ sudo chmod +x /etc/init.d/gitlab
#### New configuration options for gitlab.yml
-There are new configuration options available for gitlab.yml. View them with the command below and apply them to your current gitlab.yml if desired.
+There are new configuration options available for gitlab.yml. View them with the command below and apply them to your current gitlab.yml.
```
git diff 7-1-stable:config/gitlab.yml.example 7-2-stable:config/gitlab.yml.example
```
+Update rack attack middleware config
+
+```
+sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb
+```
+
### 7. Start application
sudo service gitlab start