aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | | [ci skip] Add benchmark your code section to contributing to ruby on rails ↵Juanito Fatas2014-05-271-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guide. I have seen many times that maintainers want people to use this gem to give a benchmark report. It would be nice to add it and refer to it later.
* | | | | | Merge pull request #15300 from arthurnn/refactor_reflectionsRafael Mendonça França2014-05-2616-34/+85
|\ \ \ \ \ \ | | | | | | | | | | | | | | Refactor reflections
| * | | | | | Refactoring .reflections public method.Arthur Neves2014-05-264-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the internal reflections will hold a reference to its public representation, so when the outside world calls `Account.reflection` we can build a list of public reflections.
| * | | | | | Use .to_s on _reflections lookupArthur Neves2014-05-242-2/+2
| | | | | | |
| * | | | | | Merge pull request #15210 from arthurnn/fix_hbtm_reflectionArthur Neves2014-05-2416-30/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix habtm reflection Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/counter_cache.rb activerecord/lib/active_record/reflection.rb activerecord/test/cases/reflection_test.rb
* | | | | | | Merge pull request #15350 from sgrif/sg-refactor-predicate-builderRafael Mendonça França2014-05-261-11/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Refactor the handling of arrays in where predicates
| * | | | | | | Refactor the handling of arrays in where predicatesSean Griffin2014-05-261-11/+14
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplifies the code slightly, isolates non-nil non-range values into a single array, which will make it easier to do things like apply type casting to them in the future.
* | | | | | | Merge pull request #15323 from JohnKellyFerguson/getting-started-appRafael Mendonça França2014-05-2630-142/+147
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Docs: Rename Posts to Articles in Guides' Getting Started App
| * | | | | | | Rename Posts to Articles in Guides' Getting Started App, continuation of ↵John Kelly Ferguson2014-05-2530-142/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #15215 [ci skip]
* | | | | | | | Merge pull request #15346 from aditya-kapoor/correct-doc-for-pathRafael Mendonça França2014-05-261-14/+14
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | correct documentation for asset_path and image_path [ci skip]
| * | | | | | | correct docs for (asset|image)_path [ci skip]Aditya Kapoor2014-05-271-14/+14
|/ / / / / / /
* | | | | | | Merge pull request #15345 from matthewd/skip-dalli-errorsGuillermo Iguaran2014-05-261-0/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Skip individual tests upon Dalli::RingError
| * | | | | | | Skip individual tests upon Dalli::RingErrorMatthew Draper2014-05-271-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike the outer `rescue`, this one is much more precise about what we want to handle: a connection failure (`Dalli::RingError`) is not relevant to what we're testing here. But other Dalli errors may well be indicating an actual problem.
* | | | | | | | Merge pull request #15342 from aditya-kapoor/correct-tag-docsRafael Mendonça França2014-05-261-10/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | correct docs for audio_tag and video_tag [ci skip]
| * | | | | | | correct doc for (audio|video)_tag [ci skip]Aditya Kapoor2014-05-271-10/+10
| | | | | | | |
* | | | | | | | Escape user input before showing in the page.Rafael Mendonça França2014-05-261-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not a security issue since this page is not present in production and user have to type something in the field but is better to escape the input.
* | | | | | | Merge pull request #15333 from ShunsukeAida/update_ruby_versionRafael Mendonça França2014-05-261-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | update the recommended ruby version.
| * | | | | | | update the recommended ruby versionShunsukeAida2014-05-271-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #15294 from schneems/schneems/generator-output-in-error2Rafael Mendonça França2014-05-262-14/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | print generators on failed generate
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 16:32:15 +0000