Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10003 from tkhr/refactor-scoping-test-files | Carlos Antonio da Silva | 2013-03-30 | 3 | -330/+333 |
|\ | | | | | Reorganize scoping test files | ||||
| * | split relation_scoping_test.rb's default scoping tests into another file | Takehiro Adachi | 2013-03-30 | 2 | -357/+360 |
| | | |||||
| * | rename named_scope_test.rb to a proper file name | Takehiro Adachi | 2013-03-30 | 1 | -1/+1 |
| | | | | | | | | | | The file name should be name_scoping_test.rb and the class should be `NamedScopingTest` according to ActiveRecord::Scoping::Name | ||||
| * | move tests for NamedScope and DefaultScope under test/cases/scoping/ | Takehiro Adachi | 2013-03-30 | 2 | -0/+0 |
| | | | | | | | | | | | | The scoping/default.rb and scoping/named.rb got moved under scoping/ in commit 2b22564c4efaa63d4bbc006762838c4025c1bdca, but the tests never did. | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-30 | 10 | -37/+62 |
|\ \ | |/ |/| | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip] | ||||
| * | explain method invertible_for [ci skip] | Neeraj Singh | 2013-03-29 | 1 | -1/+2 |
| | | |||||
| * | Fixed typo : contraints -> constraints | Prathamesh Sonpatki | 2013-03-23 | 1 | -2/+2 |
| | | |||||
| * | Fix typo | Carson McDonald | 2013-03-22 | 1 | -1/+1 |
| | | | | | | | | [ci skip] | ||||
| * | Fix typo, ording to ordering | Carson McDonald | 2013-03-18 | 1 | -1/+1 |
| | | | | | | | | [ci skip] | ||||
| * | nodoc AR::ConnectionHandling for adapters [ci skip] | Francesco Rodriguez | 2013-03-15 | 5 | -12/+12 |
| | | |||||
| * | Unmatched parenthesis fix | Robin Dupret | 2013-03-15 | 1 | -1/+1 |
| | | |||||
| * | make the headers consistent | Waynn Lue | 2013-03-14 | 1 | -2/+2 |
| | | |||||
| * | Fix my typo | Alexey Muranov | 2013-03-12 | 1 | -1/+1 |
| | | |||||
| * | Align indentation in comments | Alexey Muranov | 2013-03-12 | 1 | -15/+15 |
| | | |||||
| * | Document nested attributes as hash of hashes | Alexey Muranov | 2013-03-12 | 1 | -2/+26 |
| | | | | | | Document the possibility to use a hash of hashes for nested attributes for a one-to-many association (in addition to the documented possibility to use an array of hashes). | ||||
| * | Uniq cannot be used directly on an ActiveRecord model. 'DISTINCT field' is ↵ | Daniel Lobato | 2013-03-12 | 1 | -1/+1 |
| | | | | | | | | the only pluck query that translates into the aforementioned SQL | ||||
| * | Minor copy editing | Neeraj Singh | 2013-03-11 | 1 | -4/+4 |
| | | |||||
* | | Do not use deprecate method [ci skip] | Neeraj Singh | 2013-03-29 | 1 | -1/+1 |
| | | |||||
* | | fix broken sentence [ci skip] | Neeraj Singh | 2013-03-29 | 1 | -1/+1 |
| | | |||||
* | | removes activerecord/examples/associations.png | Xavier Noria | 2013-03-29 | 1 | -0/+0 |
| | | | | | | | | This seems to be a legacy file, I cannot find any place where it is used. | ||||
* | | Merge pull request #9984 from ranjaykrishna/col-prob | Rafael Mendonça França | 2013-03-28 | 3 | -4/+8 |
|\ \ | | | | | | | valid_type? added to super class abstract_adapter | ||||
| * | | added comments to test_invalid_type in sqlite3 adapter test and added ↵ | Ranjay Krishna | 2013-03-28 | 3 | -4/+8 |
| | | | | | | | | | | | | valid_type? method to abstract_adapter.rb and removed unnecessary method from sqlite3 adapter | ||||
* | | | anual_salary => annual_salary | Vipul A M | 2013-03-28 | 1 | -3/+3 |
|/ / | |||||
* | | Merge pull request #9972 from divineforest/fix-overriden-typo | Rafael Mendonça França | 2013-03-28 | 4 | -5/+5 |
|\ \ | | | | | | | Fix typo: overriden => overriDDen | ||||
| * | | Fix typo: overriden => overriDDen | Alexander Balashov | 2013-03-28 | 4 | -5/+5 |
| | | | |||||
* | | | Fixed typos in ActiveRecord | Prathamesh Sonpatki | 2013-03-28 | 3 | -5/+5 |
| | | | |||||
* | | | Merge pull request #9970 from divineforest/fix-typo | Rafael Mendonça França | 2013-03-28 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix typo | ||||
| * | | | Fix typo | Alexander Balashov | 2013-03-28 | 1 | -1/+1 |
| |/ / | |||||
* | | | Use snake case variable names, stick with the convention | Carlos Antonio da Silva | 2013-03-28 | 1 | -13/+13 |
| | | | |||||
* | | | Merge pull request #9963 from obrie/fix/after_create_updates | Carlos Antonio da Silva | 2013-03-28 | 2 | -1/+17 |
|\ \ \ | |/ / |/| | | Fix updates not working within after_create hooks | ||||
| * | | Fix updates not working within after_create hooks | Aaron Pfeifer | 2013-03-27 | 2 | -1/+17 |
| | | | |||||
* | | | Add support for FULLTEXT and SPATIAL indexes using the :type flag for MySQL. | Ken Mazaika | 2013-03-27 | 13 | -37/+108 |
| | | | |||||
* | | | Dump the 'using' options for a SQL index into the schema. | Ken Mazaika | 2013-03-27 | 3 | -2/+11 |
|/ / | |||||
* | | Fix syntax error | Rafael Mendonça França | 2013-03-27 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #9274 from KrzysiekJ/spaces_in_scope_names | Rafael Mendonça França | 2013-03-27 | 2 | -5/+17 |
|\ \ | | | | | | | | | | Use define_method when method name contains weird characters. | ||||
| * | | Use define_method when method name contains weird characters. | Krzysztof Jurewicz | 2013-03-18 | 2 | -5/+17 |
| | | | |||||
* | | | entirelyby => 'entirely by' | Neeraj Singh | 2013-03-27 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #9949 from vipulnsward/drop_yaml_error_constant | Rafael Mendonça França | 2013-03-27 | 2 | -4/+2 |
|\ \ \ | | | | | | | | | drop errors constant | ||||
| * | | | drop errors constant | Vipul A M | 2013-03-27 | 2 | -4/+2 |
| | | | | |||||
* | | | | Fixed typos in activerecord | Prathamesh Sonpatki | 2013-03-27 | 5 | -5/+5 |
| | | | | |||||
* | | | | Merge pull request #8368 from SamSaffron/master | Rafael Mendonça França | 2013-03-27 | 3 | -3/+75 |
|\ \ \ \ | |/ / / |/| | | | Allow connection_handler to be overriden per-thread | ||||
| * | | | Make connection_handler overridable per thread | Sam Saffron | 2013-03-27 | 3 | -3/+75 |
| | | | | |||||
* | | | | drop variable assignment in validations | Vipul A M | 2013-03-27 | 1 | -2/+1 |
|/ / / | |||||
* | | | Merge pull request #9876 from macksmind/restore_cols_dropped_by_hstore_test | Rafael Mendonça França | 2013-03-26 | 1 | -15/+5 |
|\ \ \ | | | | | | | | | Restore columns dropped by hstore test | ||||
| * | | | Combine tests and restore columns dropped by hstore testing | Mack Earnhardt | 2013-03-26 | 1 | -15/+5 |
| | | | | | | | | | | | | | | | | | | | | Disabling the hstore extension during testing created order dependent test failures. | ||||
* | | | | Merge pull request #9928 from vipulnsward/fix_rename_auto_increment_mysql | Rafael Mendonça França | 2013-03-26 | 6 | -11/+27 |
|\ \ \ \ | | | | | | | | | | | respect auto_increment in rename_column for mysql | ||||
| * | | | | respect auto_increment in rename_column for mysql | Vipul A M | 2013-03-27 | 6 | -11/+27 |
| | | | | | |||||
* | | | | | Checks :algorithm argument for valid values | Dan McClain | 2013-03-26 | 4 | -1/+18 |
| | | | | | |||||
* | | | | | Adds support for concurrent indexing in PostgreSQL adapter | Dan McClain | 2013-03-25 | 9 | -35/+69 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for algorithm option in MySQL indexes Moves USING and algorithm options upstream The syntax is still specific to the Adapter, so the actual executed string happens in the corresponding adapter | ||||
* | | | | Fix typo | Rafael Mendonça França | 2013-03-25 | 1 | -1/+1 |
| | | | |