From 86f76b11c670425bbab465087f25172378d76147 Mon Sep 17 00:00:00 2001
From: Artiom Lunev <artiom.lunev@gmail.com>
Date: Mon, 12 Dec 2011 21:47:00 +0200
Subject: rename gitlab config file to example

---
 .gitignore                |  1 +
 config/gitlab.yml         | 25 -------------------------
 config/gitlab.yml.example | 25 +++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 25 deletions(-)
 delete mode 100644 config/gitlab.yml
 create mode 100644 config/gitlab.yml.example

diff --git a/.gitignore b/.gitignore
index 3345ce08d13..ba68b9fb0a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ coverage/*
 *.swp
 public/uploads/
 .rvmrc
+config/gitlab.yml
\ No newline at end of file
diff --git a/config/gitlab.yml b/config/gitlab.yml
deleted file mode 100644
index 5d40b2b3440..00000000000
--- a/config/gitlab.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Gitlab application config file
-
-# Email used for notification
-# about new issues, comments
-email:
-  from: notify@gitlabhq.com
-  host: gitlabhq.com
-
-# Git Hosting congiguration
-git_host:
-  system: gitolite
-  admin_uri: git@localhost:gitolite-admin
-  base_path: /home/git/repositories/
-  host: localhost
-  git_user: git
-  # port: 22
-
-# Git settings
-# Use default values unless you understand it
-git:
-  # Max size of git object like commit, in bytes
-  # This value can be increased if you have a very large commits
-  git_max_size: 5242880 # 5.megabytes
-  # Git timeout to read commit, in seconds
-  git_timeout: 10
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
new file mode 100644
index 00000000000..5d40b2b3440
--- /dev/null
+++ b/config/gitlab.yml.example
@@ -0,0 +1,25 @@
+# Gitlab application config file
+
+# Email used for notification
+# about new issues, comments
+email:
+  from: notify@gitlabhq.com
+  host: gitlabhq.com
+
+# Git Hosting congiguration
+git_host:
+  system: gitolite
+  admin_uri: git@localhost:gitolite-admin
+  base_path: /home/git/repositories/
+  host: localhost
+  git_user: git
+  # port: 22
+
+# Git settings
+# Use default values unless you understand it
+git:
+  # Max size of git object like commit, in bytes
+  # This value can be increased if you have a very large commits
+  git_max_size: 5242880 # 5.megabytes
+  # Git timeout to read commit, in seconds
+  git_timeout: 10
-- 
cgit v1.2.3


From e74fae147abc7d2ffbf93d363dbbe45b87751f6f Mon Sep 17 00:00:00 2001
From: Artiom Lunev <artiom.lunev@gmail.com>
Date: Mon, 12 Dec 2011 21:49:40 +0200
Subject: rename database config to example

---
 .gitignore                  |  3 ++-
 config/database.yml         | 25 -------------------------
 config/database.yml.example | 25 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 26 deletions(-)
 delete mode 100644 config/database.yml
 create mode 100644 config/database.yml.example

diff --git a/.gitignore b/.gitignore
index ba68b9fb0a8..c75ef068e53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@ coverage/*
 *.swp
 public/uploads/
 .rvmrc
-config/gitlab.yml
\ No newline at end of file
+config/gitlab.yml
+config/database.yml
\ No newline at end of file
diff --git a/config/database.yml b/config/database.yml
deleted file mode 100644
index 51a4dd459dc..00000000000
--- a/config/database.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000
diff --git a/config/database.yml.example b/config/database.yml.example
new file mode 100644
index 00000000000..51a4dd459dc
--- /dev/null
+++ b/config/database.yml.example
@@ -0,0 +1,25 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000
-- 
cgit v1.2.3