Permalink
Commits on Jul 23, 2016
  1. Merge pull request #210 from zzak/master

    zzak committed Jul 23, 2016
    Replace everything with README about upstream move
Commits on Jul 22, 2016
  1. oops forgot this one too

    zzak committed Jul 22, 2016
  2. Remove .gitignore as well

    zzak committed Jul 22, 2016
  3. Remove files from tree

    zzak committed Jul 22, 2016
Commits on Jul 21, 2016
  1. 💅 [ci skip]

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

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

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

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

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

    zzak committed Jul 20, 2016
    Fix rspec old syntax warning
  3. Copy sinatra/sinatra@03c03d7

    zzak committed Jul 20, 2016
  4. Document using `Sinatra::Namespace` within an extension

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

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

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

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

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

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

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

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

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

    zzak committed Jul 19, 2016
    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
Commits on Jul 16, 2016
  1. Merge pull request #207 from 304/fix_namespace_extension

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

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

    Vasiliy Yaklushin
    Vasiliy Yaklushin committed Jul 14, 2016