aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* habtm can only ever be an association reflectionAaron Patterson2013-07-221-2/+4
* use the predicate methodAaron Patterson2013-07-221-1/+1
* Stop reading the same file twice for testing different contentCarlos Antonio da Silva2013-07-221-8/+4
* AR::Base does not need to know how to create reflection objectsAaron Patterson2013-07-223-21/+21
* remove unnecessary readerAaron Patterson2013-07-221-4/+4
* only flatten one sideAaron Patterson2013-07-221-1/+1
* extend by adding relationships rather than monkey patchingAaron Patterson2013-07-222-11/+13
* decouple extensions from association object stateAaron Patterson2013-07-222-3/+3
* Merge pull request #11558 from kennyj/bump_mysql2_to_0_3_13Guillermo Iguaran2013-07-221-1/+1
|\
| * Uses mysql2 0.3.13 or laterkennyj2013-07-231-1/+1
|/
* Leave the knowledge of boolean tag values to content tagCarlos Antonio da Silva2013-07-221-3/+3
* Use merge! to avoid a new hash and change some spots to 1.9 hash styleCarlos Antonio da Silva2013-07-221-7/+7
* Fix changelog syntax and use Ruby 1.9 hash style [ci skip]Carlos Antonio da Silva2013-07-221-2/+1
* Merge pull request #11461 from kennyj/fix_11454Yves Senn2013-07-224-8/+34
|\
| * Added some usage about ActiveRecord::Result [ci skip]kennyj2013-07-231-2/+26
| * Defines the return type of select / select_all method.kennyj2013-07-233-6/+8
|/
* Move #11546 changelog to the top [ci skip]Carlos Antonio da Silva2013-07-221-13/+13
* Add info about placing a new CHANGELOG entry to contributing guidePiotr Sarnacki2013-07-221-1/+1
* Revert "Match Dev/Prod parity for Index Page"Piotr Sarnacki2013-07-223-5/+3
* Merge pull request #11546 from swoop-inc/ss_memory_store_cache_sizePiotr Sarnacki2013-07-223-5/+53
|\
| * [Fixes #11512] improves cache size calculation in ActiveSupport::Cache::Memor...Simeon Simeonov2013-07-223-5/+53
* | Merge pull request #11528 from Empact/optimistic_lock_improvementRafael Mendonça França2013-07-225-4/+33
|\ \
| * | Don't allow `quote_value` to be called without a columnBen Woosley2013-07-223-3/+12
| * | Tidy up the "Specified column type for quote_value" changesBen Woosley2013-07-223-4/+4
| * | Specified column type for quote_valueAlfred Wong2013-07-223-1/+21
* | | Merge pull request #11537 from Karunakar/small_fixRafael Mendonça França2013-07-221-1/+1
|\ \ \
| * | | syntax fix for f.select doc. [ci skip] .Karunakar (Ruby)2013-07-221-1/+1
|/ / /
* | | Merge pull request #11551 from skammer/patch-1Yves Senn2013-07-221-1/+1
|\ \ \
| * | | Removed random dot in code sample [ci skip]Max Vasiliev2013-07-221-1/+1
| |/ /
* | | Merge pull request #11549 from dmathieu/test_duplicationSantiago Pastorino2013-07-221-4/+0
|\ \ \
| * | | remove useless duplication in include testDamien Mathieu2013-07-221-4/+0
* | | | Merge pull request #11536 from dpickett/patch-1Santiago Pastorino2013-07-221-1/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | metal is no longer mentioned on rack guideDan Pickett2013-07-211-1/+0
* | | | Merge pull request #11538 from vipulnsward/rescue-expPiotr Sarnacki2013-07-223-3/+17
|\ \ \ \
| * | | | rescue from all exceptions in `ConnectionManagement#call`Vipul A M2013-07-223-3/+17
* | | | | Merge pull request #11514 from schneems/schneems/dev-prod-parity-indexPiotr Sarnacki2013-07-223-3/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Match Dev/Prod parity for Index Pageschneems2013-07-203-3/+5
* | | | | Revert "Merge pull request #11416 from tigrish/master"Yves Senn2013-07-223-4/+4
* | | | | Merge pull request #11517 from nashby/optgroup-html-attributesPiotr Sarnacki2013-07-213-1/+25
|\ \ \ \ \
| * | | | | add support for html attributes to grouped_options_for_selectVasiliy Ermolovich2013-07-203-1/+25
| | |_|_|/ | |/| | |
* | | | | Merge pull request #11534 from gaurish/logPiotr Sarnacki2013-07-211-0/+31
|\ \ \ \ \
| * | | | | Add logging performance [ci skip]Gaurish Sharma2013-07-211-0/+31
* | | | | | Update note about declarative etags in release notesGuillermo Iguaran2013-07-211-1/+1
* | | | | | Improve comment about ActiveModel::ModelGuillermo Iguaran2013-07-211-2/+2
| |_|_|_|/ |/| | | |
* | | | | Fix note about AP/AV decoupling in release notesGuillermo Iguaran2013-07-211-1/+1
| |_|_|/ |/| | |
* | | | Clear named routes when routes.rb is reloadedAndrew White2013-07-213-0/+54
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-07-2111-28/+42
|\ \ \ \
| * | | | use strong_params in exampleMikhail Dieterle2013-07-191-1/+6
| * | | | use the appropriate RDoc code markupDamien Mathieu2013-07-181-2/+2
| * | | | document the Rails::ConsoleMethods#helper and #controller methodsDamien Mathieu2013-07-181-0/+6