diff --git a/.travis.yml b/.travis.yml index 30ee49737..4e6723544 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,4 +20,5 @@ addons: postgresql: "9.4" branches: only: + - master - staging diff --git a/CHANGELOG.md b/CHANGELOG.md index 89abb51bd..49cd0b4e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ 25.10.2016 * Outdated specs removed, failing specs fixed, rspec config improved +20.10.2016 +* Travis CI integration added, New Relic removed + 19.10.2016 * BUG fix: Record current time for outzone on domain:delete EPP request * ForceDelete automatic notice: fixed et and ee wording to reflect the date the domain is actually deleted. diff --git a/README.md b/README.md index 1af56f5e9..0f40284b6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ Domain Registry =============== +[![Build Status](https://travis-ci.org/internetee/registry.svg?branch=master)](https://travis-ci.org/internetee/registry) Full stack top-level domain (TLD) management. @@ -404,6 +405,10 @@ sudo apt-get install libxext-dev libxrender1 fontconfig * [Testing](/doc/testing.md) +### Travis CI + +* Travis is configured to build against master and staging branches by default. +* Notification emails are sent to committer by default. ### EPP web client diff --git a/config/application-example.yml b/config/application-example.yml index 4db92097f..9bdfb56f8 100644 --- a/config/application-example.yml +++ b/config/application-example.yml @@ -22,12 +22,12 @@ smtp_enable_starttls_auto: 'true' # 'false' # If your mail server requires authentication, please change. smtp_authentication: 'plain' # 'plain', 'login', 'cram_md5' registrant_url: 'https:/registrant.example.com' # for valid email body registrant links -# Staging env does not send any emails unless they are whitelisted +# Staging env does not send any emails unless they are whitelisted whitelist_emails_for_staging: > - test@example.org, + test@example.org, old@example.org, - new@example.org, - old@example.com, + new@example.org, + old@example.com, new@example.com # @@ -110,11 +110,6 @@ sk_digi_doc_service_name: 'EIS test' # # MISC -# -# New Relic app name, keep only current mode, remove other names. -# Example: 'Admin, EPP, REPP' will have name 'Admin, EPP, REPP - production' at New Relic. -new_relic_app_name: 'Admin, EPP, REPP, Registrar, Registrant' -new_relic_license_key: '42d1c2ba4ed17a9cf6297c59d80e563a3dd3c4fa' # You can use `rake secret` to generate a secure secret key. # Your secret key is used for verifying the integrity of signed cookies.