aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* added # or commentSergio2013-09-051-1/+1
* Review the changes made on 90155b4e28a3887dce9428e9df150ede3d6c7465Rafael Mendonça França2013-09-041-5/+9
* Client.exists?(1,2,3) and Client.exists?([1,2,3]) does not workSergio2013-09-051-3/+3
* Example of Join modelsSergio2013-09-041-1/+1
* `implemention` => `implementation`Vipul A M2013-09-031-1/+1
* `attibutes` => `attributes`Vipul A M2013-09-031-1/+1
* Be assertive about adding `[ci skip]` messageVipul A M2013-09-031-1/+1
* 4.0 Release notes should point to 4.0 ChangelogVipul A M2013-09-031-6/+6
* Fix spacing issueVipul A M2013-09-031-0/+1
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-08-314-12/+18
|\
| * Fix typos [ci skip]Carlos Antonio da Silva2013-08-301-2/+2
| * Add documentation for rake db:setup taskJay Hayes2013-08-291-0/+5
| * Note functional equivalence in reset taskJay Hayes2013-08-291-2/+2
| * Fix doc for singularize - `pluralized` => `singularized`Vipul A M2013-08-271-1/+1
| * Document ability to run a single test.wangjohn2013-08-211-1/+8
| * Removing merge conflict remnants in the guides.wangjohn2013-08-211-6/+0
| * Moved "`mod_expires` to be enabled" to new line.Prathamesh Sonpatki2013-08-211-2/+2
* | Merge pull request #12085 from valk/masterSantiago Pastorino2013-08-301-1/+3
|\ \
| * | FIX reload! within rails console --sandbox causes undefined method rollback u...Val Kotlarov Hoffman2013-08-301-1/+3
* | | add missing fixtures fileAaron Patterson2013-08-301-1/+2
|/ /
* | Merge pull request #12078 from prathamesh-sonpatki/typoGuillermo Iguaran2013-08-291-1/+1
|\ \
| * | Fix typo in generators test helpr -> helper [ci skip]Prathamesh Sonpatki2013-08-301-1/+1
|/ /
* | Merge pull request #12076 from dabit/masterCarlos Antonio da Silva2013-08-293-3/+3
|\ \
| * | Fix broken link to Fixtures documentation on guidesDavid Padilla2013-08-293-3/+3
* | | Stop messing up with instance variables, use protected as it was meant forCarlos Antonio da Silva2013-08-301-2/+7
* | | Remove not necessary AR changelog entry, fix markup [ci skip]Carlos Antonio da Silva2013-08-301-6/+1
* | | make sure there are actually some categories when running the testAaron Patterson2013-08-291-0/+1
* | | pk should not be required for hm:t associationsAaron Patterson2013-08-293-1/+15
|/ /
* | Merge pull request #12062 from strzalek/default-protected-varsJosé Valim2013-08-295-19/+21
|\ \
| * | Port all remaining self.protected_instance_variables to class methodsŁukasz Strzałkowski2013-08-295-19/+21
* | | Merge pull request #12051 from bcherry/preserve_datetime_millisecondsAndrew White2013-08-282-0/+9
|\ \ \
| * | | Test that PostgreSQL adapter includes `usec` when quoting `DateTime`Ben Cherry2013-08-282-0/+9
* | | | Merge branch 'typecast'Aaron Patterson2013-08-282-18/+31
|\ \ \ \
| * | | | correctly typecast keys, remove conditionals, reduce object allocationsAaron Patterson2013-08-282-7/+11
| * | | | no need to to_a the scopeAaron Patterson2013-08-281-1/+1
| * | | | remove extra flat_map arrayAaron Patterson2013-08-281-8/+9
| * | | | avoid extra empty array allocationAaron Patterson2013-08-281-10/+10
| * | | | extract owner id calculation to a methodAaron Patterson2013-08-281-1/+5
| * | | | only call to_a when we have toAaron Patterson2013-08-282-2/+6
* | | | | Merge pull request #12061 from wangjohn/refactoring_generators_baseRafael Mendonça França2013-08-281-14/+17
|\ \ \ \ \
| * | | | | Refactoring Generators::Base.wangjohn2013-08-281-14/+17
|/ / / / /
* | | | | Merge pull request #12058 from gaurish/secure-pass-docRafael Mendonça França2013-08-281-1/+3
|\ \ \ \ \
| * | | | | Add :nodoc: to ActiveModel::SecurePassword.min_costGaurish Sharma2013-08-291-1/+3
* | | | | | Merge pull request #12053 from schuetzm/doc_sqlite3_memYves Senn2013-08-281-0/+1
|\| | | | |
| * | | | | Mention the fast `test_sqlite3_mem` option in `RUNNING_UNIT_TESTS.rdoc` [ci s...Marc Schütz2013-08-281-0/+1
|/ / / / /
* | | | | Merge pull request #12033 from alexaltair/patch-1Yves Senn2013-08-271-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update Test::Unit to MinitestAlex Altair2013-08-271-1/+1
* | | | | use consistent keys between cache get / setAaron Patterson2013-08-271-1/+1
* | | | | remove intermediate variableAaron Patterson2013-08-271-3/+1
* | | | | cache association reset calculationAaron Patterson2013-08-271-4/+4