aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | a redirect is not a dispatcher by definition, so eliminate testAaron Patterson2014-05-261-1/+1
| | | |
| * | | push is_a check up to where the Constraints object is allocatedAaron Patterson2014-05-262-6/+11
| | | |
| * | | pass the request object to the applicationAaron Patterson2014-05-253-6/+8
| | | |
| * | | pass a request to `matches?` so we can avoid creating excess requestsAaron Patterson2014-05-252-7/+6
| | | |
| * | | nothing is passed to `rack_app` anymore, so rm the paramsAaron Patterson2014-05-251-1/+1
| | | |
| * | | one fewer is_a checkAaron Patterson2014-05-251-4/+3
| | | |
| * | | Constraints#app should never return another Constraints object, so switch to ↵Aaron Patterson2014-05-251-1/+1
| | | | | | | | | | | | | | | | if statement
| * | | eliminate dispatcher is_a checksAaron Patterson2014-05-241-8/+14
| | | |
| * | | push is_a?(Dispatcher) check in to one placeAaron Patterson2014-05-244-14/+12
| | | |
| * | | Always construct route objects with Constraint objectsAaron Patterson2014-05-244-9/+10
| | | |
* | | | Merge pull request #15372 from akshay-vishnoi/test-casesRafael Mendonça França2014-05-271-1/+1
|\ \ \ \ | | | | | | | | | | Test Case - Change method name
| * | | | Test Case - Change method nameAkshay Vishnoi2014-05-281-1/+1
|/ / / /
* | | | Merge pull request #15371 from sgrif/sg-silence-deprecation-warningRafael Mendonça França2014-05-271-0/+3
|\ \ \ \ | | | | | | | | | | Silence deprecation warning in test
| * | | | Silence deprecation warning in testSean Griffin2014-05-271-0/+3
| | |_|/ | |/| | | | | | | | | | Missed a case that only occured for mysql/mysql2
* | | | Merge pull request #12080 from ShayDavidson/fix_datetime_partial_datesMatthew Draper2014-05-283-1/+31
|\ \ \ \ | | | | | | | | | | | | | | | Added partial days support to `DateTime`'s `advance` method.
| * | | | Fixed changelogShay Davidson2013-09-021-4/+12
| | | | |
| * | | | Added partial days support to `DateTime`'s `advance` method.Shay Davidson2013-08-303-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 Pastorino2014-05-271-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 Tan2014-05-251-1/+4
| | | | | |
* | | | | | Require active_support at the railtiesRafael Mendonça França2014-05-272-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Railties need to be used without having to require any dependecy first.
* | | | | | Merge pull request #14834 from al2o3cr/issue14155Aaron Patterson2014-05-273-2/+31
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Correctly alias table names when joining more than once
| * | | | | WIP: pass existing joins to construct_join_dependencyMatt Jones2014-05-163-2/+31
| | | | | |
* | | | | | Merge pull request #15295 from sgrif/sg-deprecate-decimalsRafael Mendonça França2014-05-277-2/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | Deprecate decimal columns being automatically treated as integers
| * | | | | | Deprecate decimal columns being automatically treated as integersSean Griffin2014-05-277-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_fixRafael Mendonça França2014-05-273-25/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix redefine a has_and_belongs_to_many inside inherited class
| * | | | | | | Fix redefine a has_and_belongs_to_many inside inherited classArthur Neves2014-05-273-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_symYves Senn2014-05-271-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | remove unwanted `to_sym` call.
| * | | | | | | | remove unwanted `to_sym` call.Kuldeep Aggarwal2014-05-261-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #15327 from alexbel/replace_double_quotes_with_single_quotesYves Senn2014-05-273-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 Gemfilealexbel2014-05-263-11/+25
| | | | | | | | | |
* | | | | | | | | | Merge pull request #15356 from deeeki/activesupport_loadingYves Senn2014-05-273-4/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | Remove `require 'active_support'` from individual modules
| * | | | | | | | | Remove `require 'active_support'` from individual modulesdeeeki2014-05-273-4/+0
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let users require `active_support` before loading any ActiveSupport modules http://guides.rubyonrails.org/active_support_core_extensions.html
* | | | | | | | | Fix syntax error from 5eae77cZachary Scott2014-05-261-1/+1
| | | | | | | | |
* | | | | | | | | Move test to the proper fileRafael Mendonça França2014-05-262-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All preload tests are in the eager_test file
* | | | | | | | | Add test case for b13d260Rafael Mendonça França2014-05-261-0/+9
| | | | | | | | |
* | | | | | | | | Merge pull request #15301 from zzak/issue_15212Rafael Mendonça França2014-05-261-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip if the association was already loaded.
| * | | | | | | | | Skip if the association was already loaded.Zachary Scott2014-05-241-0/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #15353 from sgrif/sg-mysql-conditionRafael Mendonça França2014-05-261-2/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary branch from quoting in Mysql
| * | | | | | | | | | Remove unnecessary branch from quoting in MysqlSean Griffin2014-05-261-2/+0
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is already the behavior for `BigDecimal` in the abstract adapter.
* | | | | | | | | | Typo in AR CHANGELOG [ci skip]Zachary Scott2014-05-261-1/+1
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #15284 from sgrif/sg-propertiesRafael Mendonça França2014-05-2617-22/+194
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a public API to allow users to specify column types
| * | | | | | | | | Add a public API to allow users to specify column typesSean Griffin2014-05-2617-22/+194
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a result of all of the refactoring that's been done, it's now possible for us to define a public API to allow users to specify behavior. This is an initial implementation so that I can work off of it in smaller pieces for additional features/refactorings. The current behavior will continue to stay the same, though I'd like to refactor towards the automatic schema detection being built off of this API, and add the ability to opt out of automatic schema detection. Use cases: - We can deprecate a lot of the edge cases around types, now that there is an alternate path for users who wish to maintain the same behavior. - I intend to refactor serialized columns to be built on top of this API. - Gem and library maintainers are able to interact with `ActiveRecord` at a slightly lower level in a more stable way. - Interesting ability to reverse the work flow of adding to the schema. Model can become the single source of truth for the structure. We can compare that to what the database says the schema is, diff them, and generate a migration.
* | | | | | | | | Pass through AM documentation re: 02d048d [ci skip]Zachary Scott2014-05-262-5/+7
| | | | | | | | |
* | | | | | | | | Use "Action Mailer" as canonical name in documentation [ci skip]Zachary Scott2014-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See also: https://github.com/rails/rails/commit/3a297f8db75b172882bb3c2f9440d0c7365b8b11#commitcomment-6451708
* | | | | | | | | Add description of ActionMailer::TestHelper module [ci skip]Zachary Scott2014-05-261-0/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #15352 from sgrif/sg-allow-empty-array-whereRafael Mendonça França2014-05-261-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Allow empty arrays in where predicates
| * | | | | | | | Allow empty arrays in where predicatesSean Griffin2014-05-261-0/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #15351 from sgrif/sg-allowed-typesRafael Mendonça França2014-05-261-4/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Extract types which don't require additional typecasting to a method
| * | | | | | | | Extract types which don't require additional typecasting to a methodSean Griffin2014-05-261-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Database specific adapters shouldn't need to override `type_cast` to define types which are already in an acceptable state.
* | | | | | | | | Merge pull request #15347 from JuanitoFatas/benchmark-in-contributing-to-rorZachary Scott2014-05-261-0/+30
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ci skip] Add benchmark your code section to contributing to ruby on rails guide.