aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #11584 from Peeja/actionmailer-guide-typoRafael Mendonça França2013-07-241-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | AM Guide: Should be "different formats".Peter Jaros2013-07-241-1/+1
|/ / / / /
* | | | | Merge pull request #11559 from bughit/11533_to_procJosé Valim2013-07-244-3/+12
|\ \ \ \ \
| * | | | | don't convert mailer default values to procsAlex Tsukernik2013-07-224-3/+12
* | | | | | Merge pull request #11579 from kennyj/refactor_20130724Rafael Mendonça França2013-07-241-10/+9
|\ \ \ \ \ \
| * | | | | | Fix indentation.kennyj2013-07-241-8/+8
| * | | | | | Simplify select_one method.kennyj2013-07-241-2/+1
* | | | | | | Merge pull request #11570 from joelcogen/harmonize_text_field_and_areaRafael Mendonça França2013-07-244-3/+24
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | text_area should handle nil value option like text_fieldJoel Cogen2013-07-244-3/+24
|/ / / / / /
* | | | | | Refactor to use flat_mapCarlos Antonio da Silva2013-07-231-3/+3
* | | | | | oops!Aaron Patterson2013-07-231-1/+1
* | | | | | eliminate conditional in JoinHelperAaron Patterson2013-07-232-2/+2
* | | | | | acually get the actual source reflection :cry::gun:Aaron Patterson2013-07-232-9/+17
* | | | | | Merge pull request #11107 from nettsundere/password-confirmation-fixGuillermo Iguaran2013-07-233-2/+18
|\ \ \ \ \ \
| * | | | | | Fix secure_password password_confirmation validationsVladimir Kiselev2013-07-243-2/+18
* | | | | | | stop relying on side effects of const_missingAaron Patterson2013-07-232-7/+13
|/ / / / / /
* | | | | | add a specific factory method rather than using newAaron Patterson2013-07-239-13/+11
* | | | | | Use GeneratedAttribute#column_name if #reference? scaffold_generator in _form...Zachary Scott2013-07-232-0/+29
* | | | | | factory methods should not have side effects.Aaron Patterson2013-07-233-8/+11
* | | | | | extract mutation from generation methodAaron Patterson2013-07-232-4/+6
* | | | | | Merge pull request #11566 from rajcybage/masterRafael Mendonça França2013-07-231-1/+1
|\ \ \ \ \ \
| * | | | | | add the missing middleware in command line guides rake about [ci skip]Rajarshi Das2013-07-231-1/+1
* | | | | | | 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
|\ \ \ \ \ \ \