Merge branch '7-1-stable' into 7-1-stable-ee

Jacob Vosmaer
2 parents 8334d8ab 0b029ad4
Showing 1 changed file with 11 additions and 0 deletions Show diff stats
README.md
@@ -381,6 +381,17 @@ gitlab_rails[&#39;omniauth_providers&#39;] = [
 ]
 ```
  
+### Adjusting Unicorn settings
+
+If you need to adjust the Unicorn timeout or the number of workers you can use
+the following settings in `/etc/gitlab/gitlab.rb`. Run `sudo gitlab-ctl
+reconfigure for the change to take effect.
+
+```ruby
+unicorn['worker_processes'] = 3
+unicorn['worker_timeout'] = 60
+```
+
 ## Backups
  
 ### Creating an application backup
...	...	@@ -381,6 +381,17 @@ gitlab_rails['omniauth_providers'] = [
381	381	]
382	382	```
383	383
	384	+### Adjusting Unicorn settings
	385	+
	386	+If you need to adjust the Unicorn timeout or the number of workers you can use
	387	+the following settings in `/etc/gitlab/gitlab.rb`. Run `sudo gitlab-ctl
	388	+reconfigure for the change to take effect.
	389	+
	390	+```ruby
	391	+unicorn['worker_processes'] = 3
	392	+unicorn['worker_timeout'] = 60
	393	+```
	394	+
384	395	## Backups
385	396
386	397	### Creating an application backup
...	...