Permalink
Commits on Nov 27, 2010
Commits on Nov 10, 2010
Commits on Nov 9, 2010
  1. [merb-core] Revert erroneous push

    This reverts commits:
      * 9c4fcbe
      * 7e5cd3e
    ngollan committed Nov 9, 2010
  2. rubydoc.info integration

      * Add "yardoc" rake task to generate integrated .yardopts file
        including parameters and paths (.document is legacy)
      * Remove .document, add generated .yardopts instead
    ngollan committed Nov 9, 2010
Commits on Nov 8, 2010
  1. [merb-core] Identifier matching

    The identifier matching code could match a superclass in URL generation,
    leading to unexpected results in URL generation.
    ngollan committed Nov 7, 2010
  2. Added rdoc.info document

    namelessjon committed Dec 22, 2009
Commits on Nov 7, 2010
  1. [merb-haml] YARD documentation

    ngollan committed Nov 7, 2010
Commits on Nov 5, 2010
  1. Merb stack: YARD formatting

      * Added some custom templates and a stylesheet to show "@api plugin"
      * Added forgotten symlinks
    ngollan committed Nov 5, 2010
  2. [merb-gen] YARD documentation

    ngollan committed Nov 5, 2010
  3. [merb-slices] Fix documentation

      * Moved slices router extendsions to a module for easier doc
        generation.
      * Always use the old YARD parser, as the new one has issues.
    ngollan committed Nov 5, 2010
Commits on Nov 4, 2010
  1. Merb stack: "root documentation"

      * Add generated documentation and *.rbc to .gitignore
      * Move "doc:yard" tasks to just "yard". The "doc" task builds YARD
        documentation for enabled gems.
      * Gem Rakefiles now descend into docs/
      * Removed webgen and rdoc tasks from converted gems
    ngollan committed Nov 4, 2010
Commits on Nov 3, 2010
Commits on Nov 2, 2010
  1. [merb-action-args] Doc update, Rubinius

      * Migrate docs to YARD
      * Small fix to use the "vm" impementation of #get_args in Rubinius
        (fails one more spec in rbx than in 1.9.1 due to a bug in rbx)
      * Remove requirement of an old compatibility gem that provided
        Method#parameters
        (Breaks compatibility with pre-1.9.2 MRI)
    ngollan committed Nov 2, 2010
Commits on Oct 29, 2010
  1. [merb-core] YARD transition

    merb-core should now have all code documentation converted to YARD.
    ngollan committed Oct 29, 2010
  2. [merb-core] More YARD documentation

    Eleo committed with ngollan Oct 28, 2010
  3. [merb-core] Switch merb-core to YARD (2nd merged master patch)

          * Made #resource and #url docs point at Merb::Router
          * Documentation updates from Eleo <sireleo@gmail.com>
    ngollan committed Oct 28, 2010
Commits on Oct 28, 2010
  1. [merb-gen] Always use latest merb_datamapper version.

    Merb datamapper plugin has now separate versioning schema. It's best
    to use the latest version of the gem.
    pk committed Oct 28, 2010
  2. [merb-gen] Add separate versioning for the merb-auth gems to

    the stack gemfile.
    pk committed Oct 28, 2010
Commits on Oct 26, 2010
  1. [merb-core] Switch merb-core to YARD (1st merged master patch)

      * Add YARD Rake task (doc:yard)
      * Change ":api:" marker to @api tag
      * update documentation standards
      * Modified documentation of:
        - lib/merb-core.rb
        - lib/merb-core/controller/abstract_controller.rb
        - lib/merb-core/dispatch/request.rb
        - lib/merb-core/bootloader.rb
        - lib/merb-core/config.rb
        - lib/merb-core/controller/exceptions.rb
        - lib/merb-core/controller/merb_controller.rb
        - lib/merb-core/controller/mime.rb
        - lib/merb-core/controller/mixins/authentication.rb
        - lib/merb-core/controller/mixins/controller.rb
        - lib/merb-core/controller/mixins/render.rb
        - lib/merb-core/controller/mixins/responder.rb
        - lib/merb-core/core_ext/class.rb
        - lib/merb-core/core_ext/hash.rb
        - lib/merb-core/core_ext/kernel.rb
        - lib/merb-core/controller/mixins/conditional_get.rb
        - lib/merb-core/dispatch/router/behavior.rb
    ngollan committed with pk Oct 20, 2010
Commits on Sep 23, 2010
  1. Seems enough to get my app up and running with merb. Tested Tempfile.…

    …new('string') in < 1.9.2 rubies and it seemed AOK. No harm, no foul.
    xrl committed with pk Aug 20, 2010
Commits on Jul 20, 2010
  1. [merb-core] Fix route sorting for Ruby 1.8.x

    [#1330 state:resolved]
    pk committed Jul 20, 2010