Merge branch 'registry-516' into registry-480

.travis.yml

@@ -7,7 +7,6 @@ before_script:
   - "psql -c 'create database registry_whois_test;' -U postgres"
   - "psql -c 'create database registry_api_log_test;' -U postgres"
   - "cp config/application-example.yml config/application.yml"
-  - "cp config/secrets-example.yml config/secrets.yml"
   - "cp config/database-travis.yml config/database.yml"
   - "RAILS_ENV=test bundle exec rake db:setup:all"
 script:

config/application.rb

@@ -80,6 +80,7 @@ module Registry
     }
 
     config.action_view.default_form_builder = 'DefaultFormBuilder'
+    config.secret_key_base = Figaro.env.secret_key_base
   end
 end
 

config/initializers/set_secret.rb

@@ -1 +0,0 @@
-Registry::Application.config.secret_token = ENV['secret_key_base']

config/secrets-example.yml

@@ -1,14 +0,0 @@
-development:
-  secret_key_base: generate-your-secret-key-by-rake-secret
- 
-test:
-  secret_key_base: generate-your-secret-key-by-rake-secret
-
-alpha:
-  secret_key_base: generate-your-secret-key-by-rake-secret
-
-staging:
-  secret_key_base: generate-your-secret-key-by-rake-secret
-
-production:
-  secret_key_base: generate-your-secret-key-by-rake-secret