From d0d483dd2d428cbe4b1dc44300f627d0dae1e6ff Mon Sep 17 00:00:00 2001 From: Mauricio Giacomini Girardello <mgg12@inf.ufpr.br> Date: Tue, 15 Mar 2016 11:09:59 -0300 Subject: [PATCH] testing gitlab-ci --- .gitlab-ci.yml | 3 ++- config/database.yml | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77de73f1..2efd61be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,8 @@ services: variables: POSTGRES_DB: portalmec_test - DATABASE_URL: "postgresql://postgres:5432/portalmec_test" + POSTGRES_USER: portalmec + POSTGRES_PASSWORD: 123mudar before_script: - apt-get update -y diff --git a/config/database.yml b/config/database.yml index d224689f..a9b906fd 100644 --- a/config/database.yml +++ b/config/database.yml @@ -6,11 +6,14 @@ default: &defaults development: &development <<: *defaults database: portalmec_dev - username: - password: + username: portalmec + password: 123mudar test: - url: <%= ENV['DATABASE_URL'] %> + <<: *defaults + database: portalmec_test + username: portalmec + password: 123mudar production: <<: *defaults -- GitLab