From b5cd66d41de98c63fdb048e3d0ce600c9353e230 Mon Sep 17 00:00:00 2001 From: Matt Woodward Date: Mon, 15 Jul 2013 15:32:41 -0700 Subject: [PATCH 1/5] Update installation.md Updated incorrect/outdated references to unicorn.rb; changed to puma.rb --- doc/install/installation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index 65865e1635b..7a024fc2bef 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -186,11 +186,11 @@ You can change `5-3-stable` to `master` if you want the *bleeding edge* version, sudo chmod -R u+rwX public/uploads # Copy the example Puma config - sudo -u git -H cp config/unicorn.rb.example config/unicorn.rb + sudo -u git -H cp config/puma.rb.example config/puma.rb # Enable cluster mode if you expect to have a high load instance # Ex. change amount of workers to 3 for 2GB RAM server - sudo -u git -H vim config/unicorn.rb + sudo -u git -H vim config/puma.rb # Configure Git global settings for git user, useful when editing via web # Edit user.email according to what is set in gitlab.yml From 670e1be7a402b1340393d298c7ebc05930ed7ac3 Mon Sep 17 00:00:00 2001 From: Matt Woodward Date: Mon, 15 Jul 2013 15:35:14 -0700 Subject: [PATCH 2/5] Update installation.md Additional unicorn -> puma reference update --- doc/install/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index 65865e1635b..ea9cbb5608d 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -198,7 +198,7 @@ You can change `5-3-stable` to `master` if you want the *bleeding edge* version, sudo -u git -H git config --global user.email "gitlab@localhost" **Important Note:** -Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. +Make sure to edit both `gitlab.yml` and `puma.rb` to match your setup. ## Configure GitLab DB settings From 87e8c2dc3ddb6a988ffcd0fee19f98ac8063bb8b Mon Sep 17 00:00:00 2001 From: Sean Zicari Date: Wed, 17 Jul 2013 13:51:12 -0700 Subject: [PATCH 3/5] Update README.md Updated the relative links in ## Contents to point to the correct documents. --- doc/api/README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/api/README.md b/doc/api/README.md index 9d6e229e4cb..4bcd89949df 100644 --- a/doc/api/README.md +++ b/doc/api/README.md @@ -69,18 +69,18 @@ When listing resources you can pass the following parameters: ## Contents -+ [Users](api/users.md) -+ [Session](api/session.md) -+ [Projects](api/projects.md) -+ [Project Snippets](api/project_snippets.md) -+ [Repositories](api/repositories.md) -+ [Issues](api/issues.md) -+ [Milestones](api/milestones.md) -+ [Notes](api/notes.md) -+ [Deploy Keys](api/deploy_keys.md) -+ [System Hooks](api/system_hooks.md) -+ [Groups](api/groups.md) -+ [User Teams](api/user_teams.md) ++ [Users](users.md) ++ [Session](session.md) ++ [Projects](projects.md) ++ [Project Snippets](project_snippets.md) ++ [Repositories](repositories.md) ++ [Issues](issues.md) ++ [Milestones](milestones.md) ++ [Notes](notes.md) ++ [Deploy Keys](deploy_keys.md) ++ [System Hooks](system_hooks.md) ++ [Groups](groups.md) ++ [User Teams](user_teams.md) ## Clients From 2d9bbe662eed29dc099e4bb7e6408503f0489e09 Mon Sep 17 00:00:00 2001 From: Ariejan de Vroom Date: Thu, 18 Jul 2013 12:59:18 +0200 Subject: [PATCH 4/5] Revert "Update installation.md" This reverts commit b5cd66d41de98c63fdb048e3d0ce600c9353e230. --- doc/install/installation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index ca2dac8abaf..ea9cbb5608d 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -186,11 +186,11 @@ You can change `5-3-stable` to `master` if you want the *bleeding edge* version, sudo chmod -R u+rwX public/uploads # Copy the example Puma config - sudo -u git -H cp config/puma.rb.example config/puma.rb + sudo -u git -H cp config/unicorn.rb.example config/unicorn.rb # Enable cluster mode if you expect to have a high load instance # Ex. change amount of workers to 3 for 2GB RAM server - sudo -u git -H vim config/puma.rb + sudo -u git -H vim config/unicorn.rb # Configure Git global settings for git user, useful when editing via web # Edit user.email according to what is set in gitlab.yml From afa1a20de1b3e8d8d1be7cb85069bc5ae069f9d8 Mon Sep 17 00:00:00 2001 From: Ariejan de Vroom Date: Thu, 18 Jul 2013 12:59:41 +0200 Subject: [PATCH 5/5] Revert "Update installation.md" This reverts commit 670e1be7a402b1340393d298c7ebc05930ed7ac3. --- doc/install/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index ea9cbb5608d..65865e1635b 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -198,7 +198,7 @@ You can change `5-3-stable` to `master` if you want the *bleeding edge* version, sudo -u git -H git config --global user.email "gitlab@localhost" **Important Note:** -Make sure to edit both `gitlab.yml` and `puma.rb` to match your setup. +Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. ## Configure GitLab DB settings