aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Put back Relation#join method as a delegate to ArrayBogdan Gusiev2014-05-055-2/+17
| | | | | | | | This is a regression 4.0 -> 4.1 fix. In 4.1.0 Relation#join is delegated to Arel#SelectManager. In 4.0 series it is delegated to Array#join This patch puts back the behaviour of 4.0
* Arel master is 6.0.0Rafael Mendonça França2014-05-051-1/+1
|
* Improve CHANGELOG entryRafael Mendonça França2014-05-041-2/+2
|
* Use assert_raisesRafael Mendonça França2014-05-041-3/+1
|
* Do not use short-circuit returnRafael Mendonça França2014-05-041-2/+3
|
* Merge pull request #11166 from xavier/callable_constraint_verificationRafael Mendonça França2014-05-043-0/+29
|\ | | | | | | | | | | | | Callable route constraint verification Conflicts: actionpack/CHANGELOG.md
| * Verify that route constraints respond to the expected messages instead of ↵Xavier Defrang2013-06-283-0/+29
| | | | | | | | silently failing to enforce the constraint
* | Improve CHANGELOG [ci skip]Rafael Mendonça França2014-05-041-2/+2
| |
* | No need the else clauseRafael Mendonça França2014-05-041-2/+0
| |
* | Merge pull request #14949 from bogdan/empty-hash-array-parameterizationRafael Mendonça França2014-05-043-9/+22
|\ \ | | | | | | [Fixes #14948] Hash#to_query: right serialization for empty hash and array
| * | [Fixes #14948] Hash#to_query: Changed a way how empty hash and empty array ↵Bogdan Gusiev2014-05-033-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are serialized Empty Hash or Array should not present in serialization result {a: []}.to_query # => "" {a: {}}.to_query # => "" For more info see #14948.
* | | Invert the if/else clauseRafael Mendonça França2014-05-041-1/+1
| | | | | | | | | | | | The case where the value is present is more common
* | | Merge pull request #14946 from jcoleman/fix-null-binary-column-logging-exceptionRafael Mendonça França2014-05-043-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 Coleman2014-05-023-1/+20
| | | |
* | | | Merge pull request #14973 from kuldeepaggarwal/f-refactorRafael Mendonça França2014-05-041-1/+2
|\ \ \ \ | | | | | | | | | | Convert column name to string only once
| * | | | Convert column name to string only onceKuldeep Aggarwal2014-05-041-1/+2
| | | | |
* | | | | Merge pull request #14974 from kuldeepaggarwal/remove-deprecated-filesRafael Mendonça França2014-05-042-14/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove deprecated file
| * | | | | Remove deprecated file(`active_support/core_ext/object/to_json.rb`) and its ↵Kuldeep Aggarwal2014-05-042-14/+0
| |/ / / / | | | | | | | | | | | | | | | test case.
* | | | | Merge pull request #14961 from jonatack/patch-7Robin Dupret2014-05-041-89/+74
|\ \ \ \ \ | |/ / / / |/| | | | Follow-up to #14905 and formatting pass [ci skip]
| * | | | Follow-up to #14905 and formatting passJon Atack2014-05-041-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 Silva2014-05-041-16/+14
| | | | |
* | | | | Use the reader attribute rather than the instance var when possibleCarlos Antonio da Silva2014-05-041-2/+2
| | | | |
* | | | | Simplify building options hash in rename column method for mysqlCarlos Antonio da Silva2014-05-041-5/+6
| | | | |
* | | | | Get rid of conditional since column_for handles raising nowCarlos Antonio da Silva2014-05-041-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 ORCarlos Antonio da Silva2014-05-041-4/+2
| | | | |
* | | | | Convert column name to string only onceCarlos Antonio da Silva2014-05-041-1/+2
| | | | |
* | | | | Rails One Click is not maintained anymore [ci skip]Robin Dupret2014-05-041-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-processYves Senn2014-05-041-0/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document ActionController::TestCase::Behavior#process [ci skip]
| * | | | | Document ActionController::TestCase::Behavior#processGaurish Sharma2014-05-041-0/+27
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | refactor, move `column_for` to `AbstractAdapter` for better reuse.Yves Senn2014-05-044-17/+11
| | | | |
* | | | | Merge pull request #14966 from ↵Yves Senn2014-05-045-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 Xiang2014-05-035-21/+1
| | | | | |
* | | | | | Merge pull request #14959 from akshay-vishnoi/doc_changesRobin Dupret2014-05-041-4/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Typo, grammar and textual changes [ci skip]
| * | | | | Typo, grammar and textual changes [ci skip]Akshay Vishnoi2014-05-031-4/+5
| | | | | |
* | | | | | Revert "Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-ar"Yves Senn2014-05-034-114/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fe9859600824268ff614cb3eb48b62c7165a1fbd, reversing changes made to add9560643ef79830febf47fa1228752d1df3502.
* | | | | | Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-arYves Senn2014-05-034-102/+114
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Reorganize ActiveRecord's rake tasks
| * | | | | Reorganize ActiveRecord tasks [Arun Agrawal & Abd ar-Rahman Hamidi]Arun Agrawal2014-05-034-102/+114
| | | | | |
* | | | | | Remove duplicated fixture additionCarlos Antonio da Silva2014-05-031-1/+1
| | | | | |
* | | | | | Refactor test to not care about the specific result of valid?Carlos Antonio da Silva2014-05-031-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_loadYves Senn2014-05-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | make `db:structure:load` listed with `rake -T`
| * | | | | make `db:structure:load` listed with `rake -T`Greg Molnar2014-05-021-1/+1
| | | | | |
* | | | | | docs, restructure newly added part to `includes`. [ci skip]Yves Senn2014-05-031-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up to #14139. /cc @carlosantoniodasilva
* | | | | | Merge pull request #14924 from eric-chahin/issue_13854Matthew Draper2014-05-035-1/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixed custom validation context bug for child associations
| * | | | | | Fixed custom validation context bug where childEric Chahin2014-05-015-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | associations were not being saved. Fixes #13854. [Eric Chahin, Aaron Nelson, & Kevin Casey]
* | | | | | | Merge pull request #14956 from akshay-vishnoi/refactorAaron Patterson2014-05-021-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use #include? instead of #any?, make it simpler
| * | | | | | | Use #include? instead of #any?, make it simplerAkshay Vishnoi2014-05-031-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #14957 from akshay-vishnoi/test-casesRafael Mendonça França2014-05-031-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Test typecasting on instance rather than class itself
| * | | | | | Test typecasting on instance rather than class itselfAkshay Vishnoi2014-05-031-1/+1
|/ / / / / /
* | | | | | Add missing require to fix test :bomb:Carlos Antonio da Silva2014-05-021-0/+1
| | | | | |
* | | | | | Add branch to arel on Gemfile to allow local bundle config [ci skip]Carlos Antonio da Silva2014-05-021-1/+1
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 08:28:09 +0000