Changeset 135

Show
Ignore:
Timestamp:
01/05/07 13:14:23 (2 years ago)
Author:
e.@brainspl.at
Message:

shuffled repository into merb/trunk merb/tags merb/branches. bear with me

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/README

    r132 r135  
    5757$ merb 
    5858 
    59 You will need the mongrel_upload_progress gem installed to go to /files 
    60 so use the -f flag to load a config file for mongrel_upload_progress 
     59To use the upload example at /files you will need to add a cli flag 
     60so use the -f flag to load a config file for merb_upload_progress 
    6161$ merb -f dist/conf/mup.conf 
    6262 
     
    189189end 
    190190 
    191 Sessions are available when you start merb with the -s flag. See sample app for 
     191Sessions are available when you start merb with the sql_session set to true or the memory_session set to true. See sample app for 
    192192migration too add session table. 
    193193 
  • trunk/Rakefile

    r125 r135  
    5858  s.required_ruby_version = '>= 1.8.4' 
    5959 
    60   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{app,bin,test,lib,examples}/**/*")  
     60  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{bin,test,lib,examples}/**/*")  
    6161       
    6262  s.require_path = "lib"