aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* AS::Callbacks: deprecate monkey patch codeBogdan Gusiev2012-06-265-1/+23
* 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
| * | Add a description about ENV["SCOPE"]kennyj2012-06-261-1/+1
| * | Change the behavior of db:test:prepare task when schema_format is sql for con...kennyj2012-06-262-1/+10
| * | Change the behavior of db:test:clone task when schema_format is sql for consi...kennyj2012-06-262-1/+20
| * | Change an order of methods for readbility.kennyj2012-06-261-7/+7
* | | Merge pull request #6853 from frodsan/nodoc_patch2Rafael Mendonça França2012-06-2510-19/+19
|\| |
| * | add :nodoc: to internal implementations [ci skip]Francesco Rodriguez2012-06-2510-19/+19
|/ /
* / Make internal callback model definitions private in AMoCarlos Antonio da Silva2012-06-251-5/+7
|/
* Rails 4 will be 1.9.3+ only [ci skip]Rafael Mendonça França2012-06-251-9/+3
* Revert "Merge pull request #6344"Piotr Sarnacki2012-06-254-17/+5
* Merge branch 'number-helpers-refactor'Carlos Antonio da Silva2012-06-245-190/+159
|\
| * Get rid of the clear_i18n hack by using a different localeCarlos Antonio da Silva2012-06-241-20/+10
| * Move number helper i18n related tests to ASCarlos Antonio da Silva2012-06-242-122/+124
| * Refactor AV number helper tests with invalid numbersCarlos Antonio da Silva2012-06-241-44/+14
| * Move constants to the top, remove freezeCarlos Antonio da Silva2012-06-241-5/+5
| * Do not propagate the :raise option to AS number helpersCarlos Antonio da Silva2012-06-241-7/+19
| * Remove some not used variables and improve code a bitCarlos Antonio da Silva2012-06-241-12/+7
|/
* Merge pull request #6847 from benolee/patch-1Carlos Antonio da Silva2012-06-241-6/+6
|\
| * correct line numbers for reader and writer methodsbenolee2012-06-241-6/+6
|/
* Merge pull request #6842 from ernie/handle-non-strings-in-grouped-calculationsRafael Mendonça França2012-06-242-6/+22
|\
| * Stop assuming strings for grouped calculationsErnie Miller2012-06-242-6/+22
|/
* Merge pull request #6805 from tim-vandecasteele/uploadedfile-paramifyCarlos Antonio da Silva2012-06-232-1/+8
|\
| * Don't paramify ActionDispatch::Http::UploadedFile in testsTim Vandecasteele2012-06-222-1/+8
* | Merge pull request #6837 from kennyj/move_to_tasks_dirCarlos Antonio da Silva2012-06-234-0/+0
|\ \
| * | Move tasks(rake) tests to under the tasks dir.kennyj2012-06-244-0/+0
|/ /
* | Merge pull request #6836 from flyerhzm/ruby_19_hashCarlos Antonio da Silva2012-06-236-16/+16
|\ \
| * | ruby 1.9 hash syntax for generated codeRichard Huang2012-06-236-16/+16
* | | format the 4.0 release notes [ci skip]Vijay Dev2012-06-231-52/+45
* | | Add test cases for 46492949b8c09f99db78b9f7a02d039e7bc6a702Andrew White2012-06-231-0/+52
|/ /
* | eliminating another string subclassAaron Patterson2012-06-221-3/+7
* | fix some accidental nilsAaron Patterson2012-06-222-3/+3
* | Merge pull request #6832 from frodsan/nodoc_patch1Rafael Mendonça França2012-06-2210-12/+11
|\ \
| * | add :nodoc: to internal implementations [ci skip]Francesco Rodriguez2012-06-2210-12/+11
|/ /
* | Merge pull request #6821 from tonywok/pg_datetime_precisionRafael Mendonça França2012-06-223-0/+87
|\ \
| * | Allow precision option for postgresql datetimesTony Schneider2012-06-223-0/+87
|/ /
* | Merge pull request #6829 from frodsan/misunderstood_paramRafael Mendonça França2012-06-221-2/+2
|\ \
| * | change param name to improve documentationFrancesco Rodriguez2012-06-221-2/+2
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-2216-151/+340
|\ \
| * | fixes a few mistakes in api docs [ci skip]Vijay Dev2012-06-226-9/+7
| * | copy edit the assets guide[ci skip]Vijay Dev2012-06-221-17/+6
| * | update ActiveModel::Callbacks documentation [ci skip]Francesco Rodriguez2012-06-221-24/+26