aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6886 from nertzy/faster_stringify_and_symbolize_keysCarlos Antonio da Silva2012-06-271-1/+1
|\
| * Speed up Hash#transform_keys using Hash#each_keyGrant Hutchins2012-06-271-1/+1
|/
* Merge pull request #6878 from masarakki/masterRafael Mendonça França2012-06-275-0/+41
|\
| * fix: limit of enum columns of mysqlYamada Masaki2012-06-285-0/+41
|/
* Merge pull request #6873 from mauricio/fix-for-6825Rafael Mendonça França2012-06-273-16/+58
|\
| * Fixes #6825, adds tests covering cases and error possibilities, also changes ...Mauricio Linhares2012-06-273-16/+58
|/
* Add changelog entry for polymorphic option in model generatorCarlos Antonio da Silva2012-06-271-0/+10
* Merge pull request #6880 from kennyj/fix_20120628Carlos Antonio da Silva2012-06-272-2/+2
|\
| * Fix wrong environment. env should be RAILS_ENV or test.kennyj2012-06-281-1/+1
| * Fix wrong testcase. This is a testcase for db:test:prepare.kennyj2012-06-281-1/+1
* | Merge pull request #6856 from lexmag/polymorphic_generatorsCarlos Antonio da Silva2012-06-274-14/+42
|\ \
| * | Add polymorphic option to model generatorAleksey Magusev2012-06-274-14/+42
* | | Merge pull request #6879 from yahonda/address_basic_inclusion_model_test_oracleRafael Mendonça França2012-06-271-1/+1
|\ \ \ | |_|/ |/| |
| * | Address test_basic_model test error with Oracle enhanced adapterYasuo Honda2012-06-271-1/+1
|/ /
* | Merge pull request #6863 from bcardarella/asyn-actionmailer-guidesXavier Noria2012-06-261-0/+31
|\ \
| * | Guide update for Async ActionMailerBrian Cardarella2012-06-261-0/+31
* | | Refactor attribute method matcher to use Hash#fetchCarlos Antonio da Silva2012-06-261-5/+3
* | | Cleanup attribute methods a bit, use map! when accepting *argsCarlos Antonio da Silva2012-06-261-17/+12
* | | Use default + merge! instead of reverse_mergeCarlos Antonio da Silva2012-06-261-1/+1
* | | Set hash value instead of merge a single key, and use flatten! if possibleCarlos Antonio da Silva2012-06-262-4/+5
* | | Ensure Array#to_sentence does not modify given hashCarlos Antonio da Silva2012-06-263-8/+14
* | | Merge pull request #6870 from erichmenge/patch/base_test_oracleRafael Mendonça França2012-06-261-20/+8
|\ \ \
| * | | Setup each test with default ActiveRecord timezone settings to ensure each te...Erich Menge2012-06-261-20/+8
|/ / /
* | | Remove file added by mistake at 88230b7cf77181c2088cce3314493caa9b3ac1fbRafael Mendonça França2012-06-261-1/+0
* | | Merge pull request #6859 from bogdan/deprecate_monkey_patchJosé Valim2012-06-265-1/+23
|\ \ \
| * | | AS::Callbacks: deprecate monkey patch codeBogdan Gusiev2012-06-265-1/+23
* | | | Merge pull request #6858 from amatsuda/av_no_such_method_update_detailsJosé Valim2012-06-261-2/+1
|\ \ \ \
| * | | | :update_details method no more exists on @lookup_contextAkira Matsuda2012-06-261-2/+1
| |/ / /
* | | | Merge pull request #6839 from bcardarella/async-actionmailerAaron Patterson2012-06-268-0/+86
|\ \ \ \ | |/ / / |/| | |
| * | | Some final syntax fixesBrian Cardarella2012-06-242-3/+2
| * | | Better documentation for ActionMailer.asyncBrian Cardarella2012-06-241-2/+2
| * | | Better documentation for ActionMailer.asyncBrian Cardarella2012-06-241-0/+4
| * | | Forcing the message sending is no longer necessaryBrian Cardarella2012-06-242-16/+1
| * | | Support for custom queues on the mailerBrian Cardarella2012-06-233-18/+30
| * | | Removed unecessary splattingBrian Cardarella2012-06-231-1/+1
| * | | Use Delegator for a cleaner QueuedMessage classBrian Cardarella2012-06-231-13/+8
| * | | Updated ChangelogsBrian Cardarella2012-06-232-0/+5
| |/ /
| * | Force message delivery despite asyncBrian Cardarella2012-06-232-2/+16
| * | Add commented out ActionMailer async config optionBrian Cardarella2012-06-231-0/+3
| * | AsyncMailer documentionBrian Cardarella2012-06-232-0/+3
| * | Asynchronous ActionMailerBrian Cardarella2012-06-235-0/+66
* | | Use args.flatten! in query methods when applicableCarlos Antonio da Silva2012-06-251-7/+12
* | | Merge pull request #6544 from flexoid/issue-6431Piotr Sarnacki2012-06-253-6/+14
|\ \ \
| * | | exists?(false) returns falseEgor Lynko2012-06-253-6/+14
* | | | Ensure Arel columns are typecasted properly when grouping with calculationCarlos Antonio da Silva2012-06-252-9/+13
* | | | Merge pull request #6857 from rsutphin/as_core_ext_time_missing_requireCarlos Antonio da Silva2012-06-251-0/+1
|\ \ \ \
| * | | | Add missing require.Rhett Sutphin2012-06-251-0/+1
| | |_|/ | |/| |
* | | | Merge pull request #6855 from kennyj/refactor_database_tasksRafael Mendonça França2012-06-252-21/+46
|\ \ \ \ | |/ / / |/| | |
| * | | Move to db:structure namespace, because these methods are global.kennyj2012-06-261-8/+9
| * | | Remove session_table_name method because this is global and used only once.kennyj2012-06-261-5/+1