Permalink
Commits on Apr 27, 2009
Commits on Apr 20, 2009
  1. fixed a rubygems 1.3.2 bug

    mattetti committed Apr 20, 2009
  2. Merge branch 'master' of git@github.com:wycats/merb

    * 'master' of git@github.com:wycats/merb:
      Change Merb::Controller to respond to #call and return a Rack Array.
      Adding additional specs for the throw :halt within controller actions (#1202)  
      Fixing asset spec so its not dependent on hash key ordering
      Adds ERB bench
      Adding an option for :anchor on url generation. Same functionality as :fragment, however many people are used to :anchor. (Lighthouse ticket #1005)
      Revert "Made it raise NotImplemented if you don't return something valid from a controller action, as requested in lighthouse ticket #1201."
      image_tag should not raise an error when image is nil or empty string (Lighthouse #1243)
      Adds support for Merb::Config[:ignore_system_gems], which if set to true will *not* fallback to system gems. This enables you to be sure your merb app has all required gems bundled, and not accidently using system gems.
      Adding :source option on Kernel::dependency
      Explain the flat template/layout paths in generated application.rb.
      Made it raise NotImplemented if you don't return something valid from a controller action, as requested in lighthouse ticket #1201.
      #1199: adding merb.resource helper in merb -i similar to merb.url
      #1202: Adding the ability to use throw :halt within any action for consistency sake, and the ability to reuse before filters (with throw :halt) as methods inside your actions
      #1238 added merb-gen to dependencies.rb on newly generated apps
      Merb-core should be dependency at new plugin, not the whole merb
      #1198: added merb.route_to, a console helper that allows you to easily verify your routes
      #1195 Fix for merb.reload! in merb interactive console
    mattetti committed Apr 20, 2009
  3. Merge branch 'action_orm'

    * action_orm:
      action_orm, set merb version dependency
      started the wrapper
    mattetti committed Apr 20, 2009
Commits on Apr 19, 2009
  1. Change Merb::Controller to respond to #call and return a Rack Array.

      Paired with Jacques.
    wycats committed Apr 19, 2009
Commits on Apr 18, 2009
Commits on Apr 9, 2009
  1. Adds ERB bench

    wycats committed Apr 9, 2009
Commits on Apr 1, 2009
  1. removed obsolete private spec

    mattetti committed Mar 31, 2009
Commits on Mar 30, 2009
  1. bumped DM version to 0.9.11

    mattetti committed Mar 30, 2009
Commits on Mar 25, 2009
  1. Fix Local IP Address regexp

    pusewicz committed with mattetti Mar 25, 2009
Commits on Mar 24, 2009
  1. started the wrapper

    mattetti committed Mar 24, 2009
Commits on Mar 20, 2009
  1. Adding an option for :anchor on url generation. Same functionality as…

    … :fragment, however many people are used to :anchor. (Lighthouse ticket #1005)
    jcnetdev committed with mattetti Mar 19, 2009
Commits on Mar 19, 2009
  1. Adding an option for :anchor on url generation. Same functionality as…

    … :fragment, however many people are used to :anchor. (Lighthouse ticket #1005)
    jcnetdev committed Mar 19, 2009
  2. Merge branch 'master' of git@github.com:wycats/merb

    * 'master' of git@github.com:wycats/merb:
      Update merb_datamapper to use DataMapper.repository instead of Kernel#repository
      Poll for memory every 30 seconds instead of every 1/4 second
    mattetti committed Mar 19, 2009
  3. image_tag should not raise an error when image is nil or empty string…

    … (Lighthouse #1243)
    jcnetdev committed with mattetti Mar 19, 2009
  4. Revert "Made it raise NotImplemented if you don't return something va…

    …lid from a controller action, as requested in lighthouse ticket #1201."
    
    This reverts commit 7732e63.
    mattetti committed with jcnetdev Mar 18, 2009
Commits on Mar 18, 2009
  1. Revert "Made it raise NotImplemented if you don't return something va…

    …lid from a controller action, as requested in lighthouse ticket #1201."
    
    This reverts commit 7732e63.
    mattetti committed Mar 18, 2009
  2. Made it raise NotImplemented if you don't return something valid from…

    … a controller action, as requested in lighthouse ticket #1201.
    Graham Batty committed with mattetti Feb 23, 2009
  3. Adds support for Merb::Config[:ignore_system_gems], which if set to t…

    …rue will *not* fallback to system gems. This enables you to be sure your merb app has all required gems bundled, and not accidently using system gems.
    jcnetdev committed with mattetti Mar 15, 2009