Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #15374 from sgrif/sg-private-properties | Rafael Mendonça França | 2014-05-27 | 12 | -30/+12 | |
|\ \ \ | | | | | | | | | Remove AR Properties from the public API | |||||
| * | | | Remove AR Properties from the public API | Sean Griffin | 2014-05-27 | 12 | -30/+12 | |
| | | | | | | | | | | | | | | | | | | | | Making this part of the public API was premature, let's make it private again while I continue to work on the surrounding code. | |||||
* | | | | Add CHANGELOG entry for #15269 [ci skip] | Rafael Mendonça França | 2014-05-27 | 1 | -0/+4 | |
| | | | | ||||||
* | | | | Merge pull request #15269 from arunagw/aa-fixes-8930 | Rafael Mendonça França | 2014-05-27 | 3 | -1/+42 | |
|\ \ \ \ | | | | | | | | | | | rake railties:install:migrations respects the order of railties | |||||
| * | | | | rake railties:install:migrations respects the order of railties | Arun Agrawal | 2014-05-27 | 3 | -1/+42 | |
| | | | | | | | | | | | | | | | | | | | | This PR fixes #8930 and some stuff from #8985 | |||||
* | | | | | Merge pull request #15373 from akshay-vishnoi/test-cases | Rafael Mendonça França | 2014-05-27 | 1 | -0/+10 | |
|\ \ \ \ \ | | | | | | | | | | | | | Add test case for clear mappings | |||||
| * | | | | | Add test case for clear mappings | Akshay Vishnoi | 2014-05-28 | 1 | -0/+10 | |
| | | | | | | ||||||
* | | | | | | Deprecate all *_filter callbacks in favor of *_action callbacks | Rafael Mendonça França | 2014-05-27 | 7 | -218/+228 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the continuation of the work started at 9d62e04838f01f5589fa50b0baa480d60c815e2c | |||||
* | | | | | | rm dead code | Aaron Patterson | 2014-05-27 | 1 | -5/+0 | |
| | | | | | | ||||||
* | | | | | | PARAMETERS_KEY is only used in the request, so move the constant there | Aaron Patterson | 2014-05-27 | 3 | -9/+9 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'constraints' | Aaron Patterson | 2014-05-27 | 11 | -75/+85 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * constraints: rm reset_parameters because we automatically do it from 9ca4839a move path_parameter encoding check to the request object dispatcher doesn't need `call` anymore call `serve` with the request on dispatchers constraints class does not need the request class anymore give all endpoints a superclass skip the build business if the stack is empty stop hardcoding path_parameters and get it from the request we do not need to cache rack_app a redirect is not a dispatcher by definition, so eliminate test push is_a check up to where the Constraints object is allocated pass the request object to the application pass a request to `matches?` so we can avoid creating excess requests nothing is passed to `rack_app` anymore, so rm the params one fewer is_a check Constraints#app should never return another Constraints object, so switch to if statement eliminate dispatcher is_a checks push is_a?(Dispatcher) check in to one place Always construct route objects with Constraint objects Conflicts: actionpack/lib/action_controller/metal.rb | |||||
| * | | | | | rm reset_parameters because we automatically do it from 9ca4839a | Aaron Patterson | 2014-05-27 | 3 | -9/+0 | |
| | | | | | | ||||||
| * | | | | | move path_parameter encoding check to the request object | Aaron Patterson | 2014-05-27 | 3 | -18/+13 | |
| | | | | | | ||||||
| * | | | | | dispatcher doesn't need `call` anymore | Aaron Patterson | 2014-05-27 | 1 | -4/+0 | |
| | | | | | | ||||||
| * | | | | | call `serve` with the request on dispatchers | Aaron Patterson | 2014-05-27 | 1 | -9/+10 | |
| | | | | | | ||||||
| * | | | | | constraints class does not need the request class anymore | Aaron Patterson | 2014-05-27 | 1 | -4/+4 | |
| | | | | | | ||||||
| * | | | | | give all endpoints a superclass | Aaron Patterson | 2014-05-27 | 4 | -22/+40 | |
| | | | | | | ||||||
| * | | | | | skip the build business if the stack is empty | Aaron Patterson | 2014-05-26 | 1 | -2/+6 | |
| | | | | | | ||||||
| * | | | | | stop hardcoding path_parameters and get it from the request | Aaron Patterson | 2014-05-26 | 1 | -1/+2 | |
| | | | | | | ||||||
| * | | | | | we do not need to cache rack_app | Aaron Patterson | 2014-05-26 | 1 | -9/+3 | |
| | | | | | | ||||||
| * | | | | | a redirect is not a dispatcher by definition, so eliminate test | Aaron Patterson | 2014-05-26 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | push is_a check up to where the Constraints object is allocated | Aaron Patterson | 2014-05-26 | 2 | -6/+11 | |
| | | | | | | ||||||
| * | | | | | pass the request object to the application | Aaron Patterson | 2014-05-25 | 3 | -6/+8 | |
| | | | | | | ||||||
| * | | | | | pass a request to `matches?` so we can avoid creating excess requests | Aaron Patterson | 2014-05-25 | 2 | -7/+6 | |
| | | | | | | ||||||
| * | | | | | nothing is passed to `rack_app` anymore, so rm the params | Aaron Patterson | 2014-05-25 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | one fewer is_a check | Aaron Patterson | 2014-05-25 | 1 | -4/+3 | |
| | | | | | | ||||||
| * | | | | | Constraints#app should never return another Constraints object, so switch to ↵ | Aaron Patterson | 2014-05-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | if statement | |||||
| * | | | | | eliminate dispatcher is_a checks | Aaron Patterson | 2014-05-24 | 1 | -8/+14 | |
| | | | | | | ||||||
| * | | | | | push is_a?(Dispatcher) check in to one place | Aaron Patterson | 2014-05-24 | 4 | -14/+12 | |
| | | | | | | ||||||
| * | | | | | Always construct route objects with Constraint objects | Aaron Patterson | 2014-05-24 | 4 | -9/+10 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #15372 from akshay-vishnoi/test-cases | Rafael Mendonça França | 2014-05-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Test Case - Change method name | |||||
| * | | | | | | Test Case - Change method name | Akshay Vishnoi | 2014-05-28 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #15371 from sgrif/sg-silence-deprecation-warning | Rafael Mendonça França | 2014-05-27 | 1 | -0/+3 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Silence deprecation warning in test | |||||
| * | | | | | | Silence deprecation warning in test | Sean Griffin | 2014-05-27 | 1 | -0/+3 | |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | Missed a case that only occured for mysql/mysql2 | |||||
* | | | | | | Merge pull request #12080 from ShayDavidson/fix_datetime_partial_dates | Matthew Draper | 2014-05-28 | 3 | -1/+31 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Added partial days support to `DateTime`'s `advance` method. | |||||
| * | | | | | | Fixed changelog | Shay Davidson | 2013-09-02 | 1 | -4/+12 | |
| | | | | | | | ||||||
| * | | | | | | Added partial days support to `DateTime`'s `advance` method. | Shay Davidson | 2013-08-30 | 3 | -5/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now add partial days (e.g. 2.5.days) to `DateTime` with the advance method. This was acheived by mimicing the `advance` implementation in `Time`. | |||||
* | | | | | | | Merge pull request #15321 from ↵ | Santiago Pastorino | 2014-05-27 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tgxworld/only_find_routes_as_heads_for_head_request Call get_routes_as_head only on HEAD requests. | |||||
| * | | | | | | | Call get_routes_as_head only on HEAD requests. | Guo Xiang Tan | 2014-05-25 | 1 | -1/+4 | |
| | | | | | | | | ||||||
* | | | | | | | | Require active_support at the railties | Rafael Mendonça França | 2014-05-27 | 2 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Railties need to be used without having to require any dependecy first. | |||||
* | | | | | | | | Merge pull request #14834 from al2o3cr/issue14155 | Aaron Patterson | 2014-05-27 | 3 | -2/+31 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Correctly alias table names when joining more than once | |||||
| * | | | | | | | WIP: pass existing joins to construct_join_dependency | Matt Jones | 2014-05-16 | 3 | -2/+31 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #15295 from sgrif/sg-deprecate-decimals | Rafael Mendonça França | 2014-05-27 | 7 | -2/+29 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Deprecate decimal columns being automatically treated as integers | |||||
| * | | | | | | | | Deprecate decimal columns being automatically treated as integers | Sean Griffin | 2014-05-27 | 7 | -2/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With ActiveRecord::Properties, we now have a reasonable path for users to continue to keep this behavior if they want it. This is an edge case that has added a lot of complexity to the code base. | |||||
* | | | | | | | | | Merge pull request #15358 from arthurnn/redefine_habtm_fix | Rafael Mendonça França | 2014-05-27 | 3 | -25/+46 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix redefine a has_and_belongs_to_many inside inherited class | |||||
| * | | | | | | | | | Fix redefine a has_and_belongs_to_many inside inherited class | Arthur Neves | 2014-05-27 | 3 | -25/+46 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After ad7b5efb55bcc2e0ccd3e7f22a81e984df8676d1, which changed how has_an_belongs_to_many used to work, we start raising an error when redefining the same has_an_belongs_to_many association. This commits fix that regression. [Fixes #14983] | |||||
* | | | | | | | | | | Merge pull request #15359 from kuldeepaggarwal/f-remove-unwanted_to_sym | Yves Senn | 2014-05-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | remove unwanted `to_sym` call. | |||||
| * | | | | | | | | | | remove unwanted `to_sym` call. | Kuldeep Aggarwal | 2014-05-26 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #15327 from alexbel/replace_double_quotes_with_single_quotes | Yves Senn | 2014-05-27 | 3 | -11/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace double quotes with single quotes while adding an entry into Gemfile | |||||
| * | | | | | | | | | | | Replace double quotes with single quotes while adding an entry into Gemfile | alexbel | 2014-05-26 | 3 | -11/+25 | |
| | | | | | | | | | | | |