aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Verify that route constraints respond to the expected messages instead of sil...Xavier Defrang2013-06-283-0/+29
* | 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: Changed a way how empty hash and empty array ar...Bogdan Gusiev2014-05-033-9/+22
* | | Invert the if/else clauseRafael Mendonça França2014-05-041-1/+1
* | | 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.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 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(`active_support/core_ext/object/to_json.rb`) and its t...Kuldeep Aggarwal2014-05-042-14/+0
| |/ / / /
* | | | | Merge pull request #14961 from jonatack/patch-7Robin Dupret2014-05-041-89/+74
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Follow-up to #14905 and formatting passJon Atack2014-05-041-89/+74
* | | | | 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
* | | | | 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
* | | | | Merge pull request #14923 from gaurish/document-testcase-processYves Senn2014-05-041-0/+27
|\ \ \ \ \
| * | | | | Document ActionController::TestCase::Behavior#processGaurish Sharma2014-05-041-0/+27
|/ / / / /
* | | | | refactor, move `column_for` to `AbstractAdapter` for better reuse.Yves Senn2014-05-044-17/+11
* | | | | Merge pull request #14966 from tgxworld/remove_unnecessary_setting_of_control...Yves Senn2014-05-045-21/+1
|\ \ \ \ \
| * | | | | 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]Akshay Vishnoi2014-05-031-4/+5
* | | | | | Revert "Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-ar"Yves Senn2014-05-034-114/+102
* | | | | | Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-arYves Senn2014-05-034-102/+114
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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
|/ / / / /
* | | | | Merge pull request #14952 from gregmolnar/schema_loadYves Senn2014-05-031-1/+1
|\ \ \ \ \
| * | | | | 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
* | | | | | Merge pull request #14924 from eric-chahin/issue_13854Matthew Draper2014-05-035-1/+31
|\ \ \ \ \ \
| * | | | | | Fixed custom validation context bug where childEric Chahin2014-05-015-1/+31
* | | | | | | Merge pull request #14956 from akshay-vishnoi/refactorAaron Patterson2014-05-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | 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 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
* | | | | | Move dup destroyed test to specific file that tests dup logicCarlos Antonio da Silva2014-05-022-9/+10
* | | | | | passing a nil in the polymorphic array is not supported. remove nils before y...Aaron Patterson2014-05-022-4/+8
| |/ / / / |/| | | |
* | | | | push up bind params on "simple" subquery calculationsAaron Patterson2014-05-022-3/+11
* | | | | passing a nil should always raise an ArgumentErrorAaron Patterson2014-05-022-1/+25