From ac147cc9f438f0d7a374b27a155d8e1fc4952df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 5 May 2013 13:45:49 +0200 Subject: Refactor config/ directory * Get rid of early pathname requirement * Use require_relative where approciate * Drop unused files * Imported new application.rb, environment.rb and environments/* from fresh Rails app * Cleaned up boot.rb * Load config in boot.rb * Deduplicate environments/integration*.rb * Move username blacklist into defaults.yml * Ruby 1.9 Hash syntax everywhere * Reorganize lib/diaspora/markdownify to match conventions * Get rid of full path requires where possible * Add dummy content to production section diaspora.yml.example to prevent warning * Drop sqlite? method * Move postgres? method into ConfigurationMethods * Drop token authentication from User --- config/unicorn.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'config/unicorn.rb') diff --git a/config/unicorn.rb b/config/unicorn.rb index 0257093e2..2e5528978 100644 --- a/config/unicorn.rb +++ b/config/unicorn.rb @@ -1,5 +1,4 @@ -require 'pathname' -require Pathname.new(__FILE__).expand_path.dirname.join('load_config') +require File.expand_path('../load_config', __FILE__) # Enable and set these to run the worker as a different user/group #user = 'diaspora' -- cgit v1.2.3