Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-10-21 17:50:42 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-10-21 17:50:42 +0400
commit85be902e0847bc7a6d49f6b2186bd59e6841f959 (patch)
tree919c37c1631b3e6a72093900c5579877c9ee0225 /doc/update/6.1-to-6.2.md
parent3f66131b574ebcd5dd9fe3b5c7a6152fa535a1d2 (diff)
Add tip to see difference between old and new config
Diffstat (limited to 'doc/update/6.1-to-6.2.md')
-rw-r--r--doc/update/6.1-to-6.2.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/update/6.1-to-6.2.md b/doc/update/6.1-to-6.2.md
index e7f6c2a5ba7..7335ca44a42 100644
--- a/doc/update/6.1-to-6.2.md
+++ b/doc/update/6.1-to-6.2.md
@@ -51,6 +51,12 @@ sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production
### 5. Update config files
+TIP: to see what changed in gitlab.yml.example in this release use next command:
+
+```
+git diff 6-1-stable:config/gitlab.yml.example 6-2-stable:config/gitlab.yml.example
+```
+
* Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/6-2-stable/config/gitlab.yml.example but with your settings.
* Make `/home/git/gitlab/config/unicorn.rb` same as https://github.com/gitlabhq/gitlabhq/blob/6-2-stable/config/unicorn.rb.example but with your settings.
* Copy rack attack middleware config