Permalink
Switch branches/tags
Nothing to show
Commits on Apr 3, 2008
  1. Fixed a bug where cache_{action,page} wouldn't work with multiple con…

    …trollers (closing #90)
    booss committed Apr 3, 2008
Commits on Mar 31, 2008
  1. Added /log dir back to default app generator; logger auto-flush set t…

    …o true (dev/test/rake env.)
    fabien committed Mar 31, 2008
  2. Fix unused literal issue, and that all tests wouldn't flash Growl (et…

    …c) as failed.
    
    Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
    jherdman committed with Ezra Zygmuntowicz Mar 30, 2008
  3. make merb.fcgi executable

    Ezra Zygmuntowicz committed Mar 31, 2008
Commits on Mar 27, 2008
  1. Resolved conflict.

    wycats committed Mar 27, 2008
  2. Small bug in existing impl.

    wycats committed Mar 27, 2008
Commits on Mar 25, 2008
  1. Add mongrel as dependency of merb meta gem

    The merb meta gem should depend on mongrel so that
    a gem install merb will install everything it needs
    to work out of the box.
    
    Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com>
    daikini committed with ivey Mar 25, 2008
  2. bump versions on all sub Rakefiles

    ivey committed Mar 25, 2008
  3. rakefile for 0.9.2

    ivey committed Mar 25, 2008
  4. Prep v0.9.2

    ivey committed Mar 25, 2008
  5. Fix merb-flat and merb-very-flat generators

    Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
    daikini committed with Ezra Zygmuntowicz Mar 25, 2008
  6. use %> not %%>

    Ezra Zygmuntowicz committed Mar 25, 2008
  7. merb-gen no longer generates apps by default

    Refactored merb-gen to require the app option to
    generate an application. ie.
      merb-gen app myapp
    
    Added help option to merb-gen so that help is
    displayed for the given generator. ie.
      merb-gen help model
      merb-gen model -h # Still works too
    
    Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
    daikini committed with Ezra Zygmuntowicz Mar 25, 2008
  8. Merge branch 'master' of git@github.com:wycats/merb-more

    Ezra Zygmuntowicz committed Mar 25, 2008
  9. fix templates so merb-gen will work.

    Ezra Zygmuntowicz committed Mar 25, 2008
  10. cache_action and cache_page should only set cache for 200 responses (…

    …closing #207)
    
    added abort_cache_action to prevent caching the action after it has been rendered.
    added abort_cache_page to prevent caching the page after it has been rendered.
    booss committed Mar 25, 2008
  11. use Dir.chdir(dir){ sh "#{SUDO} rake install" } for windows compat in…

    … rakefile
    Ezra Zygmuntowicz committed Mar 25, 2008
  12. merge drnics MERB_ROM stuff for merb-gen

    Ezra Zygmuntowicz committed Mar 25, 2008
  13. ok since merb-haml is in -more we will use Merb::Config not Merb::Plu…

    …gin.config
    
    sorry for the bouncing back and forth this is where it will stay.
    
    Also updated sass to allow for Merb::Config[:sass] to work
    Ezra Zygmuntowicz committed Mar 25, 2008
  14. Set mongrel as default adapter unless other alternative options are s…

    …pecified
    
    Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
    daikini committed with Ezra Zygmuntowicz Mar 9, 2008
Commits on Mar 24, 2008
  1. Clean up Merb-Gen

    Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
    jherdman committed with Ezra Zygmuntowicz Mar 15, 2008
  2. Added Autotest mappings for full Merb applications for both the RSpec…

    … and Test/Unit libraries.
    
    Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
    jherdman committed with Ezra Zygmuntowicz Mar 14, 2008
  3. Removing un-needed js comment sequence from bundled asset tag.

    Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
    rares committed with Ezra Zygmuntowicz Mar 20, 2008
  4. merb-more rake install task escalates user privileges too early

    Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
    Debian User committed with Ezra Zygmuntowicz Mar 22, 2008
  5. don't reload classes in test mode

    Ezra Zygmuntowicz committed Mar 24, 2008
  6. fix up merb-fcgi binary to work out of the box

    Ezra Zygmuntowicz committed Mar 24, 2008
  7. * adds implementation for #220 * modifies merb.fcgi to enable really …

    …working with fcgi setups * adds default .htaccess that manages the redirection to the CGI script
    
    Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
    Martin Grund committed with Ezra Zygmuntowicz Mar 24, 2008
  8. use __send__ not send, use require in merb-haml

    Ezra Zygmuntowicz committed Mar 24, 2008
  9. Fix merb-haml spec to pull proper config

    Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
    daikini committed with Ezra Zygmuntowicz Mar 24, 2008
  10. Fix action-args to honor controller actions defined using :define_method

    A host of other cleanups including fixes to allow the action-args spec to run at all as well as in isolation. Part of the changes to accomodate that included fixing some templates for merb-gen for some reason.
    
    Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
    greatseth committed with Ezra Zygmuntowicz Mar 24, 2008
Commits on Mar 22, 2008
  1. fix merb-more rakefiles, fix haml config options

    Ezra Zygmuntowicz committed Mar 22, 2008