Permalink
Commits on Jul 22, 2016
  1. Merge sinatra-contrib upstream

    committed Jul 22, 2016
Commits on Jul 21, 2016
  1. If no template is found, raise a 500 with message

    Closes #147
    committed Jul 21, 2016
  2. 💅 [ci skip]

    committed Jul 21, 2016
  3. Merge pull request #122 from apotonick/runner

    Add Sinatra::Runner For Managing Sinatra Servers
    committed on GitHub Jul 21, 2016
  4. Merge pull request #175 from maafy6/master

    Catch LoadError from Tilt with uninstalled template engine
    committed on GitHub Jul 21, 2016
  5. Merge branch 'change-link-header-delimiter-to-comma-and-newline' of h…

    …ttps://github.com/petedmarsh/sinatra-contrib into petedmarsh-change-link-header-delimiter-to-comma-and-newline
    committed Jul 21, 2016
Commits on Jul 20, 2016
  1. Merge pull request #199 from stjhimy/config_erb

    Allow erb syntax on yml config file
    committed on GitHub Jul 20, 2016
  2. Merge pull request #209 from stjhimy/rspec_warnings

    Fix rspec old syntax warning
    committed on GitHub Jul 20, 2016
  3. Fix rspec old syntax warning

    stjhimy committed Jul 20, 2016
  4. Copy sinatra/sinatra@03c03d7

    committed Jul 20, 2016
  5. Enable Rubinius 3.x on Travis

    Due to issues with RVM, only 'rbx' (semi) reliably works on Travis. This will run the most recent Rubinius 3.x release, which is the only supported release.
    brixen committed with Jul 19, 2016
  6. Document using `Sinatra::Namespace` within an extension

    Such as, if you want to define your routes in a separate namespace.
    
    Closes #167
    
    Thank you @dkobia for the inspiration!
    /cc sinatra/sinatra-contrib#150 (comment)
    committed Jul 20, 2016
  7. Merge pull request #195 from stjhimy/namespace_docs

    Update namespace docs with regex and better app examples
    committed on GitHub Jul 20, 2016
  8. Merge pull request #194 from stjhimy/regex_namespace

    Add missing specs for filters/helpers when using regex namespace
    committed on GitHub Jul 20, 2016
  9. Merge branch 'stjhimy-rspec'

    committed Jul 20, 2016
  10. Merge branch 'rspec' of https://github.com/stjhimy/sinatra-contrib in…

    …to stjhimy-rspec
    committed Jul 20, 2016
  11. Merge branch 'stjhimy-ruby_version'

    committed Jul 20, 2016
  12. Merge branch 'ruby_version' of https://github.com/stjhimy/sinatra-con…

    …trib into stjhimy-ruby_version
    committed Jul 20, 2016
  13. 💅 [ci skip]

    committed Jul 20, 2016
  14. Merge pull request #208 from jkowens/fix_namespacing

    Fix issue prefixing routes with conditions
    committed on GitHub Jul 20, 2016
Commits on Jul 19, 2016
  1. Always use sinatra from master until it is released

    This should help avoid some confusion about the failing build
    committed Jul 19, 2016
  2. Use Mustermann from master until a release is made

    Since master has a patch which fixes the missing `:+` implementation for
    Regular and Sinatra-based patterns.
    
    We can also re-enable the namespace specs for accepting regular expressions for
    path concatination.
    
    /cc #200 and #207
    committed Jul 19, 2016
Commits on Jul 16, 2016
  1. Merge pull request #207 from 304/fix_namespace_extension

    Fix namespace extension to support latest Sinatra version
    committed on GitHub Jul 16, 2016
Commits on Jul 15, 2016
  1. Add mustermann gem as a dependency

    Vasiliy Yaklushin committed Jul 15, 2016
  2. Fix namespace extension to support latest sinatra version

    Vasiliy Yaklushin committed Jul 14, 2016
Commits on Jul 1, 2016
  1. Merge pull request #1129 from niconegoto/Fix_README.ja.md

    Fix README.ja.md[ci skip]
    kgrz committed on GitHub Jul 1, 2016
  2. Merge pull request #1132 from windy/patch-1

    rack has released 2.0.1, update dependencies
    committed on GitHub Jul 1, 2016
  3. rack has released 2.0.1, update dependencies

    windy committed on GitHub Jul 1, 2016