diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-14 12:49:03 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-14 12:49:03 +0000 |
| commit | 7e34f7fcfc802dccae71f38d75707ea49e5fb4e9 (patch) | |
| tree | ec49c6e76fc716394e5b972cb03e63e1e2357a13 | |
| parent | 39ec62ea9890fb35beb684348a50c28f4b241509 (diff) | |
| parent | 123b3ec432227f14f6baec292f1610e839b9f705 (diff) | |
| download | gitlab-ce-7e34f7fcfc802dccae71f38d75707ea49e5fb4e9.tar.gz | |
Merge branch 'master' into 'master'
Fix typos and grammar errors
See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html
See merge request !7451
| -rw-r--r-- | config/unicorn.rb.example | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example index e5058cebce8..40a16a32359 100644 --- a/config/unicorn.rb.example +++ b/config/unicorn.rb.example @@ -44,7 +44,7 @@ listen "127.0.0.1:8080", :tcp_nopush => true # nuke workers after 30 seconds instead of 60 seconds (the default) # # NOTICE: git push over http depends on this value. -# If you want be able to push huge amount of data to git repository over http +# If you want to be able to push huge amount of data to git repository over http # you will have to increase this value too. # # Example of output if you try to push 1GB repo to GitLab over http. @@ -82,7 +82,7 @@ GC.respond_to?(:copy_on_write_friendly=) and check_client_connection false before_fork do |server, worker| - # the following is highly recomended for Rails + "preload_app true" + # the following is highly recommended for Rails + "preload_app true" # as there's no need for the master process to hold a connection defined?(ActiveRecord::Base) and ActiveRecord::Base.connection.disconnect! |