This repository was archived by the owner on May 5, 2020. It is now read-only.
forked from rails/rails
-
Notifications
You must be signed in to change notification settings - Fork 23
Journey #7
Open
tmm1
wants to merge
38
commits into
2-3-github
Choose a base branch
from
journey
base: 2-3-github
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Journey #7
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I don't even. 🤘 This is awesome. Your relentless pursuit of backports is mindboggling. |
👀 |
Conflicts: actionpack/lib/action_controller.rb actionpack/lib/action_controller/base.rb actionpack/lib/action_controller/routing/route_set.rb actionpack/lib/action_controller/routing/segments.rb actionpack/lib/action_controller/url_rewriter.rb activesupport/lib/active_support/concern.rb activesupport/lib/active_support/core_ext/hash/slice.rb activesupport/lib/active_support/core_ext/uri.rb
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backports the router from rails master.
This mostly involved copy/pasting from
ActionDispatch::Routing
in rails4 toActionController::Routing
in rails2.3. I made a bunch of tweaks to support ruby 1.8, integrate with the rails2.3 request and integration stacks, etc.Also includes a version of DeprecatedMapper that works with journey, so you can use existing rails2.3 style routes files with the new router.