diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-02-19 13:39:28 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-02-19 13:39:28 +0400 |
| commit | 9edbac5ac88ffa1ec9dad0097226b51e29ebc9ac (patch) | |
| tree | 39ea108c8c5da434e2f45bc3eef6e552aa99f314 | |
| parent | a84a929428169022c6e365c80579ad587ecc55ed (diff) | |
| parent | e74fae147abc7d2ffbf93d363dbbe45b87751f6f (diff) | |
Merge branch 'config-examples' of https://github.com/artiom/gitlabhq into artiom-config-examples
Conflicts:
.gitignore
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | config/database.yml.example (renamed from config/database.yml) | 0 | ||||
| -rw-r--r-- | config/gitlab.yml.example (renamed from config/gitlab.yml) | 0 |
3 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 12e42515b64..e842b3415c0 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ public/uploads/ nohup.out Vagrantfile .vagrant +config/gitlab.yml +config/database.yml diff --git a/config/database.yml b/config/database.yml.example index 51a4dd459dc..51a4dd459dc 100644 --- a/config/database.yml +++ b/config/database.yml.example diff --git a/config/gitlab.yml b/config/gitlab.yml.example index 5d40b2b3440..5d40b2b3440 100644 --- a/config/gitlab.yml +++ b/config/gitlab.yml.example |