diff options
| author | Tobias Bühlmann <tobias.buehlmann@gmx.de> | 2013-02-03 00:07:58 -0800 |
|---|---|---|
| committer | Tobias Bühlmann <tobias.buehlmann@gmx.de> | 2013-02-03 00:07:58 -0800 |
| commit | 221168305c785bc0f349cfef17cce40bed10142f (patch) | |
| tree | 315f095f5cc5d8f4bb2a27d9f8c652a9a0cde07d /file_upload.rb | |
| parent | 8b29a99af7911530e0f7f251a9eefca5aed6b773 (diff) | |
| parent | db4ff3d23e5bcbc88b956f42a35ee5ef98b382bf (diff) | |
Merge pull request #1 from houshuang/fix-public
Changing :public to :public_folder to avoid Sinatra error.
Diffstat (limited to 'file_upload.rb')
| -rw-r--r-- | file_upload.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/file_upload.rb b/file_upload.rb index b8b08b6..671abcb 100644 --- a/file_upload.rb +++ b/file_upload.rb @@ -10,8 +10,8 @@ class FileUpload < Sinatra::Base enable :sessions set :views, File.join(File.dirname(__FILE__), 'views') - set :public, File.join(File.dirname(__FILE__), 'public') - set :files, File.join(settings.public, 'files') + set :public_folder, File.join(File.dirname(__FILE__), 'public') + set :files, File.join(settings.public_folder, 'files') end helpers do |