Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Dec 23, 2009
  1. @snusnu

    [merb-core] More robust dependency loading

    snusnu authored
    Fixes bug where merb-gen wasn't able to generate
    any apps anymore.
    Tries to load the dependencies like this:
    1.  Use Merb::Config[:gemfile] or default Gemfile
    2a. Try to require an already bundled environment
    2b. If a Gemfile is present, use bundler to load it
    2c. Warn if no Gemfile can be found
  2. @snusnu

    [merb-core] Regenerated gemspec

    snusnu authored
Commits on Dec 20, 2009
  1. @pk
  2. @pk

    [merb-core] Fixing request parameter handling for on ASCII encodings.

    pk authored
    Merb rely on Rack for parameter encoding. ENV from Rack is in ASCII by
    default. It is possible to cast the whole Rack ENV to UTF-8 but there is
    problem with Merb::Parse#unescape which turns UTF-8 strings back to the
    This patch allows to pass encoding to the Merb::Parse#unescape to force
    encoding. This is only possible on Ruby 1.9. When on Ruby 1.9. and
    encoding parameter is not passed unescape defaults to the
    Encoding.default_internal which is nil by default.
    If all attempts to get non-nil value fails no force encoding is called
    and all strings are untouched.
    So for uscase where you want your application to work in UTF-8
    exclusively you can set Encoding.default_internal = 'UTF-8' and all your
    parameters will be in UTF-8.
  3. @pk

    [merb-core] Allow Merb to run completely without RubyGems.

    pk authored
    To use this feature you need to have disable_rubygems in your Gemfile.
    And if you want you can use also disable_system_gems.
    For Ruby >= 1.9 you must change your ./bin/merb file and use
    shebang #!/path/to/your/ruby1.9.1 --disable-gems -S
    Now you can run your Merb application without system and RubyGems loaded
    in the runtime.
Commits on Dec 18, 2009
  1. @snusnu
Commits on Dec 4, 2009
  1. @shirkevich @pk

    Fix multipart array params handling

    shirkevich authored pk committed
Commits on Dec 3, 2009
  1. @pk

    [merb-assets] Fix Ruby 1.8.6 compatibility for path_prefix patch.

    pk authored
    Method start_with? is not included in the 1.8.6.
Commits on Dec 1, 2009
  1. @pk
Commits on Nov 25, 2009
  1. @snusnu

    Added version dependency for jeweler

    snusnu authored
    This ensures that running jeweler generated rake
    tasks from a fresh git clone do what we expect.
    Older versions of jeweler don't play well with
    multiple gems inside a single git repo, and use
    sudo to install gems.
Commits on Nov 20, 2009
  1. @snusnu
Commits on Nov 17, 2009
  1. @pk
  2. @pk
  3. @pk
  4. @pk
  5. @pk
  6. @pk
  7. @pk
  8. @pk
  9. @pk

    [merb-assets] Adding possibility to set charset for js_include_tag.

    pk authored
    Adding default charset attribute to the js_include_tag in the same way
    as css_include_tag works right now. So default charset is utf-8 and is
    it possible to override it using :charset => 'xy' option.
    Fixing specs to pass on 1.9.1.
    The issue would probably be valid for other versions and implementations
    as well. Since it involves order how attributes are ordered inside the
    script tag.
    I think we should check for the attribute existence and
    value not the order.
  10. @merbjedi @pk

    [merb-core] [merb-gen] Seamless bundler support from system bin

    merbjedi authored pk committed
    This merb-gen patch provides newly generated apps with the ability to work seamlessly with the bundler, whether you run merb, rake, spec from either your local system gem path or from bin/merb, bin/rake, bin/spec.
    No more having to bundle rake and rspec. w00t!
  11. @pk
Commits on Nov 16, 2009
  1. @sickill @snusnu

    [merb-core] Fixed subdomain shared cookies handling in specs

    sickill authored snusnu committed
    [#1309 state:resolved]
Commits on Nov 15, 2009
  1. @pk
Commits on Nov 14, 2009
  1. @snusnu

    [merb-gen] Support spec/requests in autotest/merb_rspec.rb

    snusnu authored
    [#1192 state:resolved]
Commits on Nov 11, 2009
  1. @pk
  2. @snusnu
Commits on Nov 8, 2009
  1. @pk
  2. @snusnu
Commits on Nov 7, 2009
  1. @snusnu
  2. @snusnu
  3. @snusnu
  4. @snusnu

    [merb-gen] Added dm stack version constants

    snusnu authored
    Having DM_VERSION and DO_VERSION constants in
    merb-core feels wrong. The simplest solution for
    now is to duplicate the DM_VERSION_REQUIREMENT
    (already defined in merb_datamapper) in order to
    be able to write out a proper merb stack Gemfile.
  5. @snusnu
Commits on Nov 6, 2009
  1. @pk
Something went wrong with that request. Please try again.