Permalink
Commits on May 19, 2008
Commits on May 18, 2008
Commits on May 17, 2008
  1. Add README for merb-assets.

    merb-assets used to have generated stub in README.
    No longer. It now has API overview, and variety
    of examples from RDoc.
    michaelklishin committed May 17, 2008
Commits on May 15, 2008
  1. added conditionals to action caching.

    * hooks into the filter conditioning in abstract_controller of merb-core.
    * supports :if/:unless with symbols & procs.
    benburkert committed May 15, 2008
Commits on May 14, 2008
  1. ActionArgs can now eval to false

    If an action argument eval'd to false (i.e. either def action(foo = nil) or def action(foo = false))
    then action args would throw BadRequest if you did not supply an argument for foo in those examples.
    Lighthouse ticket #97.
    
    Signed-off-by: Michael S. Klishin <michael@novemberain.com>
    Andy Delcambre committed with michaelklishin May 12, 2008
  2. fix rack.rb

    Ezra Zygmuntowicz committed May 14, 2008
  3. new config/rack.rb with the new middleware.

    Ezra Zygmuntowicz committed May 14, 2008
  4. Merge branch 'jherdman'

    * jherdman:
      Don't incur the wrath of Ezra
      changes to the global_helpers should run every helper spec too
      Clean up a few stray issues
      General MerbRspec clean up
      MerbRspec has gastric bipass
      Some things for consistency
      Clean up major governing file specs
      Clean up controller specs
      Clean up view specs mapping
      Clean up helper specs and introduce a handy method for specifying the location of a given spec
      A much more concise mapping for specs
      Remove baked-in support for fixtures. This is between you and your ORM
      Better handling of stuff in /lib
      Clean up handle_results
      Add the DRY and semantically friendly 'all_specs' method
      Add exceptions for SCM directories and custom autotest mappings
    michaelklishin committed May 14, 2008
Commits on May 13, 2008
  1. fixed comment so people don't put custom rake tasks in Rakefile. We w…

    …ant to be able to easily update Rakefile without breaking users' tasks.
    mattetti committed May 13, 2008
  2. Don't incur the wrath of Ezra

    jherdman committed May 13, 2008
  3. Merge branch 'autotest_fix'

    Conflicts:
    
    	merb-gen/app_generators/merb/templates/autotest/merb_rspec.rb
    jherdman committed May 13, 2008
  4. Merge branch 'master' of git@github.com:wycats/merb-more

    Ezra Zygmuntowicz committed May 13, 2008
  5. remove :nodoc: from all -more DO NOT USE :nodoc: !!

    Ezra Zygmuntowicz committed May 13, 2008
Commits on May 12, 2008
  1. Clean up a few stray issues

    jherdman committed May 12, 2008
  2. General MerbRspec clean up

    jherdman committed May 12, 2008
  3. MerbRspec has gastric bipass

    jherdman committed May 12, 2008
  4. Some things for consistency

    jherdman committed May 12, 2008
  5. Clean up controller specs

    jherdman committed May 12, 2008
  6. Clean up view specs mapping

    jherdman committed May 12, 2008
  7. Clean up helper specs and introduce a handy method for specifying the…

    … location of a given spec
    jherdman committed May 12, 2008
  8. Clean up handle_results

    jherdman committed May 12, 2008
  9. Merge branch 'master' of git://github.com/bitbckt/merb-more

    * 'master' of git://github.com/bitbckt/merb-more:
      Minor grammatical changes.
    michaelklishin committed May 12, 2008
  10. Merge branch 'wycats'

    * wycats:
      Add note on which options must only be set using command line (see details).
      add in line to require in core tasks from merb-core to default rakefile
    michaelklishin committed May 12, 2008
  11. Add note on which options must only be set using command line (see de…

    …tails).
    
    As #229 and #297 in -core state, people try to set every possible option
    in init file. On server start and pid file drop, though, init file(s) are
    not yet loaded. So, setting pid file or port in init file makes no sense.
    Defaults are being used and it causes confusion in future.
    
    Given all this, add a note in generated init file.
    michaelklishin committed May 12, 2008
  12. Add note on which options must only be set using command line (see de…

    …tails).
    
    As #229 and #297 in -core state, people try to set every possible option
    in init file. On server start and pid file drop, though, init file(s) are
    not yet loaded. So, setting pid file or port in init file makes no sense.
    Defaults are being used and it causes confusion in future.
    
    Given all this, add a note in generated init file.
    michaelklishin committed May 12, 2008