Merge branch 'config-examples' of https://github.com/artiom/gitlabhq into artiom-config-examples

Conflicts: .gitignore

Merge branch 'config-examples' of https://github.com/artiom/gitlabhq into artiom-config-examples
Conflicts: .gitignore
9edbac5a · Dmitriy Zaporozhets · a84a9294 · e74fae14 · 9edbac5a · 9edbac5a
Commit 9edbac5a authored Feb 19, 2012 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

.gitignore .gitignore +2 -0

config/database.yml.example config/database.yml.example +0 -0

config/gitlab.yml.example config/gitlab.yml.example +0 -0

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ public/uploads/
 nohup.out
 Vagrantfile
 .vagrant
+config/gitlab.yml
+config/database.yml
--- a/config/database.yml
+++ b/config/database.yml
--- a/config/gitlab.yml
+++ b/config/gitlab.yml