Permalink
Commits on Jan 13, 2012
  1. Revert "Merge pull request #11 from spohlenz/request_class_methods"

    tenderlove committed Jan 13, 2012
    This reverts commit 9c956b8, reversing
    changes made to 2c0889f.
  2. Merge pull request #11 from spohlenz/request_class_methods

    tenderlove committed Jan 13, 2012
    Find routes based on request class methods
Commits on Jan 12, 2012
  1. make master 1.0.0 as well

    tenderlove committed Jan 12, 2012
Commits on Dec 29, 2011
  1. Merge commit 'v1.0.0.rc3'

    tenderlove committed Dec 29, 2011
    * commit 'v1.0.0.rc3':
      bumping to rc3
Commits on Dec 28, 2011
  1. Merge pull request #10 from bogdan/optional_parts_with_parameters

    tenderlove committed Dec 28, 2011
    Fix optional route parts with parameters
Commits on Dec 27, 2011
Commits on Dec 23, 2011
  1. bumping to rc3

    tenderlove committed Dec 23, 2011
Commits on Dec 21, 2011
  1. Merge branch 'master' of github.com:rails/journey

    tenderlove committed Dec 21, 2011
    * 'master' of github.com:rails/journey:
      Lets test against 1.9.3 as well
  2. i cannot spell

    tenderlove committed Dec 21, 2011
  3. Merge pull request #8 from joshk/patch-1

    tenderlove committed Dec 21, 2011
    Lets test against 1.9.3 as well
  4. Lets test against 1.9.3 as well

    joshk committed Dec 21, 2011
  5. bumping to rc2

    tenderlove committed Dec 21, 2011
  6. Revert "no rbx for now"

    tenderlove committed Dec 21, 2011
    This reverts commit 34fcd06.
  7. Merge branch 'master' of github.com:rails/journey

    tenderlove committed Dec 21, 2011
    * 'master' of github.com:rails/journey:
      Sort the alphabet so the order is consistent
  8. Adding precidence to each route so that custom regexp routes can take

    tenderlove committed Dec 21, 2011
    precidence over faster DFA routes. Fixes #7
Commits on Dec 20, 2011
  1. Merge pull request #6 from evanphx/alphabet-sorting

    tenderlove committed Dec 20, 2011
    Sort the alphabet so the order is consistent
  2. no rbx for now

    tenderlove committed Dec 20, 2011
  3. updating stuff for travis

    tenderlove committed Dec 20, 2011
Commits on Dec 14, 2011
  1. updating generated gemspec

    tenderlove committed Dec 14, 2011
  2. updating version to rc1

    tenderlove committed Dec 14, 2011
Commits on Dec 12, 2011
Commits on Oct 31, 2011
Commits on Oct 22, 2011
  1. adding .gemtest

    tenderlove committed Oct 22, 2011
Commits on Oct 19, 2011
  1. Merge remote-tracking branch 'rails/master'

    tenderlove committed Oct 19, 2011
    * rails/master:
      Symbol captures may generate multiple path segments, so don't escape /. Test splat escaping. Segregate URI path and fragment escaping utils.
      Generate escaped path parameters; unescape recognized path parameters.
      Adding lib/journey.rb to use require 'journey'
    
    Conflicts:
    	lib/journey.rb
    	lib/journey/router.rb
Commits on Oct 14, 2011
  1. Symbol captures may generate multiple path segments, so don't escape …

    jeremy committed Oct 14, 2011
    …/. Test splat escaping. Segregate URI path and fragment escaping utils.