diff options
| author | Jonne Haß <me@mrzyx.de> | 2013-05-05 15:45:49 +0400 |
|---|---|---|
| committer | Jonne Haß <me@mrzyx.de> | 2013-05-19 20:54:54 +0400 |
| commit | ac147cc9f438f0d7a374b27a155d8e1fc4952df7 (patch) | |
| tree | d90e2ce7912634e3d99911a8380333cb48ece78e /config/unicorn.rb | |
| parent | bf90dfffbda9219d59c020b1babafbec5c2bbfc8 (diff) | |
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
Diffstat (limited to 'config/unicorn.rb')
| -rw-r--r-- | config/unicorn.rb | 3 |
1 files changed, 1 insertions, 2 deletions
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' |