diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2014-08-23 10:52:04 +0200 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2014-08-23 10:52:04 +0200 |
| commit | 33431c3e7d3f32c457ffb7e35a91ff874f5ba42d (patch) | |
| tree | 7c0f449fe5d6dc314e9fcedbf21f4ba678507915 /doc/update | |
| parent | 9900c5bf81f9edee3feaf8c1e8a77fa679c0f3fa (diff) | |
| parent | aef3a5bf417ba57fa361f05b0c632fddd7c51fa1 (diff) | |
| download | gitlab-ce-33431c3e7d3f32c457ffb7e35a91ff874f5ba42d.tar.gz | |
Merge pull request #7585 from bbodenmiller/patch-11
clarify which configs should be updated
Diffstat (limited to 'doc/update')
| -rw-r--r-- | doc/update/7.1-to-7.2.md | 10 |
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 |