Commit 33431c3e authored by Robert Schilling's avatar Robert Schilling

Merge pull request #7585 from bbodenmiller/patch-11

clarify which configs should be updated
parents 9900c5bf aef3a5bf
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment