diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-02 09:37:27 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-02 09:37:27 +0300 |
| commit | e3d2f9ca736f3c20cdc77e3461890f93dadc7fe1 (patch) | |
| tree | 229bcf8882299f25c6cacd186a3997f193d9ed93 | |
| parent | 225f132e7c04b5b2eabf8a2b8ada82ed2875f798 (diff) | |
| parent | 7046acd0c527d823256dbb37c629a9012449499d (diff) | |
| download | gitlab-ci-e3d2f9ca736f3c20cdc77e3461890f93dadc7fe1.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlab-ci
| -rw-r--r-- | config/application.yml.example.development | 7 | ||||
| -rw-r--r-- | doc/install/installation.md | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/config/application.yml.example.development b/config/application.yml.example.development new file mode 100644 index 0000000..a01b6f1 --- /dev/null +++ b/config/application.yml.example.development @@ -0,0 +1,7 @@ +development: + allowed_gitlab_urls: + - 'http://localhost:3000' + gitlab_ci: + host: localhost + port: 5000 + https: false diff --git a/doc/install/installation.md b/doc/install/installation.md index ba0c3c6..c127029 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -109,8 +109,11 @@ You can use either MySQL or PostgreSQL. ## 6. Setup application # Edit application settings + # Production sudo -u gitlab_ci -H cp config/application.yml.example config/application.yml sudo -u gitlab_ci -H editor config/application.yml + # Development + #sudo -u gitlab_ci -H cp config/application.yml.example.development config/application.yml # Edit web server settings sudo -u gitlab_ci -H cp config/unicorn.rb.example config/unicorn.rb |