Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Aug 8, 2011
  1. @ngollan
  2. @ngollan
  3. @ngollan

    [merb-gen] Migration to Thor

    ngollan authored
    Thor provides similar templating capabilities as Templater, but is
    maintained.
Commits on May 23, 2011
  1. @ngollan
Commits on May 18, 2011
  1. @ngollan

    Merge branch 'master' into my_head

    ngollan authored
    Conflicts:
    	merb-action-args/lib/merb-action-args/version.rb
    	merb-core/Gemfile
    	merb-core/merb-core.gemspec
    	merb-exceptions/lib/merb-exceptions/version.rb
    	merb-haml/lib/merb-haml/version.rb
    	merb-mailer/lib/merb-mailer/version.rb
Commits on May 11, 2011
  1. @xrl
Commits on May 10, 2011
  1. @ngollan
  2. @ngollan
  3. @pk @ngollan

    [all] All source code is mow forced to UTF-8.

    pk authored ngollan committed
    We had a mix of the encodings and some files was in UTF-8
    and some not (majority) which is bad. Also UTF-8 (non-english
    projects effectively) suffered from encoding errors on different
    places and in Helpers mostly due to concatening UTF-8 strings with
    ASCII-US (source code).
  4. @xrl
Commits on Apr 26, 2011
  1. @ngollan

    [merb-gen] Run a full application from rackup

    ngollan authored
    The bootloader generates a Rack application with all necessary components,
    so we use that instead of raw merb middleware.
  2. @ngollan

    Bump main gem versions to 1.2.0.pre1, update dependencies

    ngollan authored
    merb-gen now generates dependencies on:
    
      * DataMapper ~> 1.1
      * DataObjects ~> 0.10
  3. @ngollan

    [merb-gen] Better fresh app

    ngollan authored
      * Add ".rspec" file in the application root
      * Load merb-slices in a full-stack app
Commits on Apr 25, 2011
  1. @ngollan

    [merb-gen] ActiveSupport, remove jquery script

    ngollan authored
    Remove JQuery to reduce maintenance burden.
    
    Requires a yet unreleased version of Templater. Check the README.
Commits on Apr 20, 2011
  1. @ngollan

    [merb-gen] RSpec 2

    ngollan authored
Commits on Nov 9, 2010
  1. @ngollan @pk

    [ALL] Update gemspec to new docs, root rake build task.

    ngollan authored pk committed
Commits on Nov 5, 2010
  1. @ngollan

    Merb stack: YARD formatting

    ngollan authored
      * Added some custom templates and a stylesheet to show "@api plugin"
      * Added forgotten symlinks
  2. @ngollan

    [merb-gen] YARD documentation

    ngollan authored
Commits on Oct 28, 2010
  1. @pk

    [merb-gen] Always use latest merb_datamapper version.

    pk authored
    Merb datamapper plugin has now separate versioning schema. It's best
    to use the latest version of the gem.
  2. @pk

    [merb-gen] Add separate versioning for the merb-auth gems to

    pk authored
    the stack gemfile.
Commits on Jul 20, 2010
  1. @pk
Commits on Jul 5, 2010
  1. @namelessjon

    Update generated stack for DM 1.0

    namelessjon authored
    * Make it generate a dependency on DM 1.0
    * Just depend on the sqlite-adapter, not the lower level do adapter
Commits on Jun 13, 2010
  1. @pk
  2. @pk
Commits on May 24, 2010
  1. @pk

    [merb-gen] Refactoring of the gemspec.

    pk authored
    We now don't generate gemspec using the Jeweler and Rakefile but have
    plain *.gemspec files. You can build gem using either 'gem build
    *.gemspec' or by running the gemspec as an executable.
Commits on Apr 24, 2010
  1. @pk
  2. @pk
Commits on Apr 8, 2010
  1. @pk
  2. @pk

    [merb-gen] Core, Flat and Very Flat apps to work without Bundler

    pk authored
    Explicit require of gems needed to boot the fresh generated application
    without Bundler stanzas and Bundler required in the runtime.
Commits on Apr 6, 2010
  1. @pk

    [merb-gen] Removing bundler stanza from generated apps.

    pk authored
    With removing Bundler integration from the merb-core we need to sync the
    generated apps as well.
Commits on Mar 23, 2010
  1. @namelessjon

    [merb-gen] Use Rack's ContentLength middleware

    namelessjon authored
    Rack's implementation is more robust and correctly handles a few edge
    cases merb's missed.
Commits on Mar 20, 2010
  1. @pk

    [all] Dumping version 1.1.0

    pk authored
  2. @namelessjon @pk

    [merb-gen] Correctly handle HEAD requests in apps

    namelessjon authored pk committed
    Mix the Rack::Head middleware into the default stack to ensure we don't
    send a body on HEAD requests.  Also, add the Content-Length middleware,
    so we correctly report the size of the body.
    
    [#1068 state:resolved]
Commits on Mar 14, 2010
  1. @pk

    [all] Dumping 1.1.0.rc1 version

    pk authored
  2. @pk
Something went wrong with that request. Please try again.