Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Branch: master
Commits on Dec 9, 2012
  1. @kytrinyx
Commits on Dec 8, 2012
  1. @kytrinyx

    Merge pull request #78 from sinatra/template-renderer-safety

    kytrinyx authored
    Don't mutate the template cache
  2. @kytrinyx

    Merge branch 'master' into template-renderer-safety

    kytrinyx authored
    * master:
      Add rubinius to the travis matrix
      Allow travis failures (temporarily) in ruby-head
  3. @TrevorBramble

    Don't mutate the template cache

    TrevorBramble authored
    When passing the same template twice the renderer got called with the
    wrong number of variables, and the options hash was unable to locate the
    :locals hash.
  4. @TrevorBramble

    Merge pull request #77 from sinatra/allow-travis-failures

    TrevorBramble authored
    Allow travis failures (temporarily) in ruby-head
  5. @TrevorBramble
  6. @kytrinyx
  7. @kytrinyx
Commits on Dec 4, 2012
  1. @kytrinyx
  2. @kytrinyx

    Merge pull request #21 from lest/capture-erb-utf8

    kytrinyx authored
    fix utf-8 encoding error in capture, closes #17
Commits on Dec 3, 2012
  1. @TrevorBramble @kytrinyx

    Merge branch 'namespace-error-fix' of github.com:unakatsuo/sinatra-co…

    TrevorBramble authored kytrinyx committed
    …ntrib into 1.3.x
  2. @TrevorBramble

    Merge pull request #65 from Dinduks/patch-1

    TrevorBramble authored
    Add installation instructions to the README
Commits on Dec 2, 2012
  1. Merge pull request #74 from kytrinyx/config-file-docs

    authored
    Document sharing default settings (ConfigFile).
  2. @kytrinyx

    Document sharing default settings (ConfigFile).

    kytrinyx authored
    This addresses #32 and #38.
    
    Issue #32 suggest a change in the `ConfigFile#config_for_env(hash)`
    method in order to allow a separate entry to use for shared settings,
    while issue #38 provides an implementation of an additional,
    non-environment, key `default` which default values can be added to.
    
    It seems like the existing method of sharing settings does not have any
    significant disadvantages, and just needed to be explicitly documented.
Commits on Dec 1, 2012
  1. Merge pull request #56 from rlipman/multi-route-docs

    authored
    Add example for MultiRoute with multiple verbs and multiple routes
  2. Merge pull request #50 from shime/master

    authored
    capture documentation
Commits on Nov 23, 2012
  1. Merge pull request #73 from yesmeck/master

    authored
    Fix wrong comment in cookies.rb
  2. @yesmeck
Commits on Nov 13, 2012
Commits on Nov 9, 2012
  1. Merge pull request #72 from thibautsacreste/master

    authored
    sinatra/cookies: cookies.delete did not pass the options to @response.delete_cookie
  2. @thibautsacreste
Commits on Sep 23, 2012
  1. @kylewlacy

    modify cookie[]= to support extra cookie options

    kylewlacy authored
    Using the syntax `cookie[:key, :options => 'hash']='value'`` will now
    merge the provided hash with the existing @options hash (which allows
    for changing cookie options on a per-cookie basis).
Commits on Sep 21, 2012
  1. @Dinduks
Commits on Aug 14, 2012
  1. @TrevorBramble

    Removing Rubinious from Travis CI testing

    TrevorBramble authored
    Temporarily removing Rubinious from Travis CI testing so it won't always
    cause pull request auto-testing to fail.
    
    (Real fix is to either get the Reloader specs working w/ Rubinious or
    move them out of the usual spec suite.)
Commits on Jul 26, 2012
  1. @shime
Commits on Jul 8, 2012
  1. Merge pull request #57 from aishafenton/master

    authored
    StdLib JSON library not being found.
  2. Fixes issue that is preventing stdlib JSON library from being set as …

    Aish authored
    …the default encoder.
Commits on Jun 20, 2012
  1. @TrevorBramble

    Merge pull request #54 from kamui/patch-1

    TrevorBramble authored
    Render the config file with ERB before loading with YAML
  2. @kamui
Commits on Jun 18, 2012
  1. @kamui
  2. @TrevorBramble
  3. @TrevorBramble
  4. @TrevorBramble
Commits on Jun 17, 2012
  1. @TrevorBramble
Commits on Jun 12, 2012
  1. @kamui
Something went wrong with that request. Please try again.