Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #14946 from jcoleman/fix-null-binary-column-logging-exception | Rafael Mendonça França | 2014-05-04 | 3 | -1/+20 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix exception when logging SQL w/ nil binary value. Conflicts: activerecord/CHANGELOG.md | |||||
| * | | | Fix exception when logging SQL w/ nil binary value. | James Coleman | 2014-05-02 | 3 | -1/+20 | |
| | | | | ||||||
* | | | | Merge pull request #14973 from kuldeepaggarwal/f-refactor | Rafael Mendonça França | 2014-05-04 | 1 | -1/+2 | |
|\ \ \ \ | | | | | | | | | | | Convert column name to string only once | |||||
| * | | | | Convert column name to string only once | Kuldeep Aggarwal | 2014-05-04 | 1 | -1/+2 | |
| | | | | | ||||||
* | | | | | Merge pull request #14974 from kuldeepaggarwal/remove-deprecated-files | Rafael Mendonça França | 2014-05-04 | 2 | -14/+0 | |
|\ \ \ \ \ | | | | | | | | | | | | | Remove deprecated file | |||||
| * | | | | | Remove deprecated file(`active_support/core_ext/object/to_json.rb`) and its ↵ | Kuldeep Aggarwal | 2014-05-04 | 2 | -14/+0 | |
| |/ / / / | | | | | | | | | | | | | | | | test case. | |||||
* | | | | | Merge pull request #14961 from jonatack/patch-7 | Robin Dupret | 2014-05-04 | 1 | -89/+74 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Follow-up to #14905 and formatting pass [ci skip] | |||||
| * | | | | Follow-up to #14905 and formatting pass | Jon Atack | 2014-05-04 | 1 | -89/+74 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on the Getting Started guide. [skip ci] Added 2 changes suggested by @robin850 [skip ci] | |||||
* | | | | | Fix examples indent and improve #process docs a bit [ci skip] | Carlos Antonio da Silva | 2014-05-04 | 1 | -16/+14 | |
| | | | | | ||||||
* | | | | | Use the reader attribute rather than the instance var when possible | Carlos Antonio da Silva | 2014-05-04 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | Simplify building options hash in rename column method for mysql | Carlos Antonio da Silva | 2014-05-04 | 1 | -5/+6 | |
| | | | | | ||||||
* | | | | | Get rid of conditional since column_for handles raising now | Carlos Antonio da Silva | 2014-05-04 | 1 | -7/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | column_for will raise in case column is not found for the given table, so there is no need to handle that here. | |||||
* | | | | | Simplify unless conditional with OR | Carlos Antonio da Silva | 2014-05-04 | 1 | -4/+2 | |
| | | | | | ||||||
* | | | | | Convert column name to string only once | Carlos Antonio da Silva | 2014-05-04 | 1 | -1/+2 | |
| | | | | | ||||||
* | | | | | Rails One Click is not maintained anymore [ci skip] | Robin Dupret | 2014-05-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's tell people that they should rely on Tokaido instead of Rails One Click. Fixes #14960. | |||||
* | | | | | Merge pull request #14923 from gaurish/document-testcase-process | Yves Senn | 2014-05-04 | 1 | -0/+27 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document ActionController::TestCase::Behavior#process [ci skip] | |||||
| * | | | | | Document ActionController::TestCase::Behavior#process | Gaurish Sharma | 2014-05-04 | 1 | -0/+27 | |
|/ / / / / | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | refactor, move `column_for` to `AbstractAdapter` for better reuse. | Yves Senn | 2014-05-04 | 4 | -17/+11 | |
| | | | | | ||||||
* | | | | | Merge pull request #14966 from ↵ | Yves Senn | 2014-05-04 | 5 | -21/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | tgxworld/remove_unnecessary_setting_of_controller_name Remove tests method for test cases when controller can be inferred. | |||||
| * | | | | | Remove tests method for test cases when controller can be inferred. | Guo Xiang | 2014-05-03 | 5 | -21/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #14959 from akshay-vishnoi/doc_changes | Robin Dupret | 2014-05-04 | 1 | -4/+5 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Typo, grammar and textual changes [ci skip] | |||||
| * | | | | | Typo, grammar and textual changes [ci skip] | Akshay Vishnoi | 2014-05-03 | 1 | -4/+5 | |
| | | | | | | ||||||
* | | | | | | Revert "Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-ar" | Yves Senn | 2014-05-03 | 4 | -114/+102 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fe9859600824268ff614cb3eb48b62c7165a1fbd, reversing changes made to add9560643ef79830febf47fa1228752d1df3502. | |||||
* | | | | | | Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-ar | Yves Senn | 2014-05-03 | 4 | -102/+114 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Reorganize ActiveRecord's rake tasks | |||||
| * | | | | | Reorganize ActiveRecord tasks [Arun Agrawal & Abd ar-Rahman Hamidi] | Arun Agrawal | 2014-05-03 | 4 | -102/+114 | |
| | | | | | | ||||||
* | | | | | | Remove duplicated fixture addition | Carlos Antonio da Silva | 2014-05-03 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Refactor test to not care about the specific result of valid? | Carlos Antonio da Silva | 2014-05-03 | 1 | -3/+4 | |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Only care about its truthiness rather than asserting specific true/false values. If we need to check for the return value in particular, there will be a test for that. | |||||
* | | | | | Merge pull request #14952 from gregmolnar/schema_load | Yves Senn | 2014-05-03 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | make `db:structure:load` listed with `rake -T` | |||||
| * | | | | | make `db:structure:load` listed with `rake -T` | Greg Molnar | 2014-05-02 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | docs, restructure newly added part to `includes`. [ci skip] | Yves Senn | 2014-05-03 | 1 | -6/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up to #14139. /cc @carlosantoniodasilva | |||||
* | | | | | | Merge pull request #14924 from eric-chahin/issue_13854 | Matthew Draper | 2014-05-03 | 5 | -1/+31 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fixed custom validation context bug for child associations | |||||
| * | | | | | | Fixed custom validation context bug where child | Eric Chahin | 2014-05-01 | 5 | -1/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | associations were not being saved. Fixes #13854. [Eric Chahin, Aaron Nelson, & Kevin Casey] | |||||
* | | | | | | | Merge pull request #14956 from akshay-vishnoi/refactor | Aaron Patterson | 2014-05-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use #include? instead of #any?, make it simpler | |||||
| * | | | | | | | Use #include? instead of #any?, make it simpler | Akshay Vishnoi | 2014-05-03 | 1 | -1/+1 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #14957 from akshay-vishnoi/test-cases | Rafael Mendonça França | 2014-05-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Test typecasting on instance rather than class itself | |||||
| * | | | | | | Test typecasting on instance rather than class itself | Akshay Vishnoi | 2014-05-03 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Add missing require to fix test :bomb: | Carlos Antonio da Silva | 2014-05-02 | 1 | -0/+1 | |
| | | | | | | ||||||
* | | | | | | Add branch to arel on Gemfile to allow local bundle config [ci skip] | Carlos Antonio da Silva | 2014-05-02 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Move dup destroyed test to specific file that tests dup logic | Carlos Antonio da Silva | 2014-05-02 | 2 | -9/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also change other related test to use existing record rather than creating new one. | |||||
* | | | | | | passing a nil in the polymorphic array is not supported. remove nils before ↵ | Aaron Patterson | 2014-05-02 | 2 | -4/+8 | |
| |/ / / / |/| | | | | | | | | | | | | | | you call the method | |||||
* | | | | | push up bind params on "simple" subquery calculations | Aaron Patterson | 2014-05-02 | 2 | -3/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | bind parameters we not being propogated to simple subquery calculation calls. This fixes it | |||||
* | | | | | passing a nil should always raise an ArgumentError | Aaron Patterson | 2014-05-02 | 2 | -1/+25 | |
| | | | | | ||||||
* | | | | | eliminate repetition in guide links for past releases [ci skip] | Vijay Dev | 2014-05-02 | 1 | -10/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #14943 from ↵ | Rafael Mendonça França | 2014-05-02 | 3 | -6/+28 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | arunagw/hbakhtiyor-i18n-validation-message-singular-and-plural Add singular and plural form for some validation messages | |||||
| * | | | | Add singular and plural form for some validation messages | Abd ar-Rahman Hamidi | 2014-05-02 | 3 | -6/+28 | |
| | | | | | ||||||
* | | | | | Merge pull request #14942 from JuanitoFatas/patch/cc-by-sa-4-0 | Rafael Mendonça França | 2014-05-02 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | [ci skip] Update guides license to CC BY-SA 4.0 International. | |||||
| * | | | | [ci skip] Update guides license to CC BY-SA 4.0 International. | Juanito Fatas | 2014-05-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | Benefits: https://creativecommons.org/version4 | |||||
* | | | | | Merge pull request #14941 from ↵ | Rafael Mendonça França | 2014-05-02 | 5 | -3/+65 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | arunagw/hbakhtiyor-new-plugin-command-advanced-config Plugin gemspec | |||||
| * | | | | | skip-git should not hit git commands plugin generators | Arun Agrawal | 2014-05-02 | 3 | -14/+38 | |
| | | | | | | ||||||
| * | | | | | Works correctly if git not installed | Roman Shmatov | 2014-05-02 | 2 | -8/+30 | |
| | | | | | |