Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

doc/install/database_mysql.md

@@ -28,14 +28,14 @@ We do not recommend using MySQL due to various issues. For example, case [(in)se
     # change $password in the command below to a real password you pick
     mysql> CREATE USER 'git'@'localhost' IDENTIFIED BY '$password';
 
-    # Ensure you can use the InnoDB engine which is necessary to support long indexes.
+    # Ensure you can use the InnoDB engine which is necessary to support long indexes
     # If this fails, check your MySQL config files (e.g. `/etc/mysql/*.cnf`, `/etc/mysql/conf.d/*`) for the setting "innodb = off"
     mysql> SET storage_engine=INNODB;
     
     # Create the GitLab production database
     mysql> CREATE DATABASE IF NOT EXISTS `gitlabhq_production` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`;
 
-    # Grant the GitLab user necessary permissions on the table.
+    # Grant the GitLab user necessary permissions on the database
     mysql> GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER, LOCK TABLES ON `gitlabhq_production`.* TO 'git'@'localhost';
 
     # Quit the database session

lib/support/nginx/gitlab

@@ -28,7 +28,7 @@
 ##
 
 upstream gitlab {
-  server unix:/home/git/gitlab/tmp/sockets/gitlab.socket;
+  server unix:/home/git/gitlab/tmp/sockets/gitlab.socket fail_timeout=0;
 }
 
 ## Normal HTTP host

lib/support/nginx/gitlab-ssl

@@ -34,7 +34,7 @@
 ## See installation.md#using-https for additional HTTPS configuration details.
 
 upstream gitlab {
-  server unix:/home/git/gitlab/tmp/sockets/gitlab.socket;
+  server unix:/home/git/gitlab/tmp/sockets/gitlab.socket fail_timeout=0;
 }
 
 ## Normal HTTP host