Download as
Browse Code »

Commit 9edbac5ac88ffa1ec9dad0097226b51e29ebc9ac

Authored by Dmitriy Zaporozhets
2 parents a84a9294 e74fae14
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Conflicts:
	.gitignore
Showing 5 changed files with 52 additions and 50 deletions   Show diff stats
.gitignore
  Diff comments   View file @9edbac5
... ... @@ -13,3 +13,5 @@ public/uploads/
13 13 nohup.out
14 14 Vagrantfile
15 15 .vagrant
  16 +config/gitlab.yml
  17 +config/database.yml
... ...
config/database.yml
View file @a84a929
... ... @@ -1,25 +0,0 @@
1   -# SQLite version 3.x
2   -# gem install sqlite3
3   -#
4   -# Ensure the SQLite 3 gem is defined in your Gemfile
5   -# gem 'sqlite3'
6   -development:
7   - adapter: sqlite3
8   - database: db/development.sqlite3
9   - pool: 5
10   - timeout: 5000
11   -
12   -# Warning: The database defined as "test" will be erased and
13   -# re-generated from your development database when you run "rake".
14   -# Do not set this db to the same as development or production.
15   -test:
16   - adapter: sqlite3
17   - database: db/test.sqlite3
18   - pool: 5
19   - timeout: 5000
20   -
21   -production:
22   - adapter: sqlite3
23   - database: db/production.sqlite3
24   - pool: 5
25   - timeout: 5000
config/database.yml.example 0 → 100644
  Diff comments   View file @9edbac5
... ... @@ -0,0 +1,25 @@
  1 +# SQLite version 3.x
  2 +# gem install sqlite3
  3 +#
  4 +# Ensure the SQLite 3 gem is defined in your Gemfile
  5 +# gem 'sqlite3'
  6 +development:
  7 + adapter: sqlite3
  8 + database: db/development.sqlite3
  9 + pool: 5
  10 + timeout: 5000
  11 +
  12 +# Warning: The database defined as "test" will be erased and
  13 +# re-generated from your development database when you run "rake".
  14 +# Do not set this db to the same as development or production.
  15 +test:
  16 + adapter: sqlite3
  17 + database: db/test.sqlite3
  18 + pool: 5
  19 + timeout: 5000
  20 +
  21 +production:
  22 + adapter: sqlite3
  23 + database: db/production.sqlite3
  24 + pool: 5
  25 + timeout: 5000
... ...
config/gitlab.yml
View file @a84a929
... ... @@ -1,25 +0,0 @@
1   -# Gitlab application config file
2   -
3   -# Email used for notification
4   -# about new issues, comments
5   -email:
6   - from: notify@gitlabhq.com
7   - host: gitlabhq.com
8   -
9   -# Git Hosting congiguration
10   -git_host:
11   - system: gitolite
12   - admin_uri: git@localhost:gitolite-admin
13   - base_path: /home/git/repositories/
14   - host: localhost
15   - git_user: git
16   - # port: 22
17   -
18   -# Git settings
19   -# Use default values unless you understand it
20   -git:
21   - # Max size of git object like commit, in bytes
22   - # This value can be increased if you have a very large commits
23   - git_max_size: 5242880 # 5.megabytes
24   - # Git timeout to read commit, in seconds
25   - git_timeout: 10
config/gitlab.yml.example 0 → 100644
  Diff comments   View file @9edbac5
... ... @@ -0,0 +1,25 @@
  1 +# Gitlab application config file
  2 +
  3 +# Email used for notification
  4 +# about new issues, comments
  5 +email:
  6 + from: notify@gitlabhq.com
  7 + host: gitlabhq.com
  8 +
  9 +# Git Hosting congiguration
  10 +git_host:
  11 + system: gitolite
  12 + admin_uri: git@localhost:gitolite-admin
  13 + base_path: /home/git/repositories/
  14 + host: localhost
  15 + git_user: git
  16 + # port: 22
  17 +
  18 +# Git settings
  19 +# Use default values unless you understand it
  20 +git:
  21 + # Max size of git object like commit, in bytes
  22 + # This value can be increased if you have a very large commits
  23 + git_max_size: 5242880 # 5.megabytes
  24 + # Git timeout to read commit, in seconds
  25 + git_timeout: 10
... ...