summaryrefslogtreecommitdiff
path: root/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-05-09 20:21:02 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2016-05-09 20:21:02 +0300
commit71da2e0b56a89fc87f2da3685bdebb333690593a (patch)
treebe6418658f118746ab158be162622fe8cb5f0b0e /doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md
parent011a905a821e2ff0cd2d9885ef93764018eb8346 (diff)
parent44501820152083d231459223fe09b9d9641b7c1e (diff)
downloadgitlab-ce-71da2e0b56a89fc87f2da3685bdebb333690593a.tar.gz
Merge remote-tracking branch 'origin/master' into docker-registry
Diffstat (limited to 'doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md')
-rw-r--r--doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md b/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md
index f5645d586ae..08c10d391ea 100644
--- a/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md
+++ b/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md
@@ -1,5 +1,5 @@
## Test and Deploy a ruby application
-This example will guide you how to run tests in your Ruby application and deploy it automatically as Heroku application.
+This example will guide you how to run tests in your Ruby on Rails application and deploy it automatically as Heroku application.
You can checkout the example [source](https://gitlab.com/ayufan/ruby-getting-started) and check [CI status](https://gitlab.com/ayufan/ruby-getting-started/builds?scope=all).
@@ -32,7 +32,7 @@ production:
```
This project has three jobs:
-1. `test` - used to test rails application,
+1. `test` - used to test Rails application,
2. `staging` - used to automatically deploy staging environment every push to `master` branch
3. `production` - used to automatically deploy production environmnet for every created tag
@@ -62,6 +62,6 @@ gitlab-ci-multi-runner register \
--docker-postgres latest
```
-With the command above, you create a runner that uses [ruby:2.2](https://registry.hub.docker.com/u/library/ruby/) image and uses [postgres](https://registry.hub.docker.com/u/library/postgres/) database.
+With the command above, you create a runner that uses [ruby:2.2](https://hub.docker.com/r/_/ruby/) image and uses [postgres](https://hub.docker.com/r/_/postgres/) database.
To access PostgreSQL database you need to connect to `host: postgres` as user `postgres` without password.