aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #6857 from rsutphin/as_core_ext_time_missing_requireCarlos Antonio da Silva2012-06-251-0/+1
* Ensure Arel columns are typecasted properly when grouping with calculationCarlos Antonio da Silva2012-06-252-5/+9
* Merge pull request #6842 from ernie/handle-non-strings-in-grouped-calculationsRafael Mendonça França2012-06-242-6/+22
* Remove waning of unused variableRafael Mendonça França2012-06-211-1/+0
* Merge branch 'acapilleri-update_nested_attributes'Rafael Mendonça França2012-06-212-5/+25
* Merge pull request #6758 from caironoleto/masterJosé Valim2012-06-181-13/+13
* Merge pull request #6649 from route/logger_in_metal_3_2Carlos Antonio da Silva2012-06-182-2/+21
|\
| * Added test for case when view doesn't have logger method when using ActionCon...Dmitry Vorotilin2012-06-161-0/+17
| * ActionController::Metal doesn't have logger method, check it and then delegateDmitry Vorotilin2012-06-161-2/+4
* | Merge pull request #6742 from steveklabnik/deprecate_composed_ofRafael Mendonça França2012-06-185-7/+24
|\ \
| * | Deprecating composed_of in ActiveRecordSteve Klabnik2012-06-185-7/+24
| |/
* | Use strict_args_position! if available from ThorJosé Valim2012-06-181-0/+1
* | Merge pull request #6764 from frodsan/patch-4Rafael Mendonça França2012-06-171-2/+2
|\ \
| * | bump AS deprecation_horizon to 4.0Francesco Rodríguez2012-06-171-2/+2
|/ /
* | Merge pull request #6756 from arunagw/build_fix_apRafael Mendonça França2012-06-161-1/+1
|\ \
| * | It should also include text/css => Build FixArun Agrawal2012-06-161-1/+1
|/ /
* / Merge pull request #6752 from steveklabnik/fix_5680Rafael Mendonça França2012-06-163-4/+21
|/
* Remove unneded tests.Rafael Mendonça França2012-06-141-11/+1
* registers the deprecation of update_attribute in the CHANGELOGXavier Noria2012-06-141-0/+8
* Merge pull request #6739 from steveklabnik/3-2-stableXavier Noria2012-06-147-17/+41
|\
| * Deprecate update_attribute.Steve Klabnik2012-06-147-17/+41
* | adding a test for #6459Aaron Patterson2012-06-141-0/+10
|/
* ActionController::Caching depends on RackDelegation and AbstractController::C...Santiago Pastorino2012-06-132-0/+35
* Merge pull request #6716 from frodsan/patch-2Rafael Mendonça França2012-06-121-1/+1
|\
| * Fix buildFrancesco Rodríguez2012-06-121-1/+1
|/
* Merge branch '3-2-stable-rel' into 3-2-stableAaron Patterson2012-06-1220-16/+58
|\
| * updating changelogsAaron Patterson2012-06-127-7/+11
| * bumping version numbersAaron Patterson2012-06-119-9/+9
| * updating changelogs with security fixesAaron Patterson2012-06-112-0/+6
| * updating changelogsAaron Patterson2012-06-115-0/+20
| * Array parameters should not contain nil values.Aaron Patterson2012-06-112-2/+8
| * Additional fix for CVE-2012-2661Ernie Miller2012-06-112-3/+9
* | Merge pull request #6715 from arunagw/add_assertsRafael Mendonça França2012-06-121-2/+2
* | Merge pull request #6676 from aurelian/masterRafael Mendonça França2012-06-122-1/+5
* | Merge pull request #6682 from acapilleri/dup_validation_fix_backport_for_1_9_3Rafael Mendonça França2012-06-123-1/+16
|\ \ | |/ |/|
| * Fix the the backport of the object dup with the ruby 1.9.3p194.Angelo capilleri2012-06-123-1/+16
* | Change the string to use in test case.kennyj2012-06-112-2/+2
* | Fix GH #3163. Should quote database on mysql/mysql2.kennyj2012-06-113-1/+22
* | Merge pull request #6690 from suginoy/fix-templates-copyRafael Mendonça França2012-06-112-1/+13
* | Merge pull request #6698 from yahonda/address_ora_911_masterRafael Mendonça França2012-06-112-2/+2
* | Merge pull request #6521 from Empact/throw-resultRafael Mendonça França2012-06-102-1/+8
* | Remove warningRafael Mendonça França2012-06-101-1/+1
* | Add test to column alias in `exists?` SQL.Rafael Mendonça França2012-06-101-0/+6
* | Minimal change to query generation of exists? that makes SQLServer and others...iaddict2012-06-101-1/+1
* | Merge pull request #6688 from c42engineering/buffered_logger_level_while_crea...Rafael Mendonça França2012-06-102-2/+7
|\ \
| * | buffered logger is initialized with the log level passed trough the initializerNiranjan Paranjape2012-06-092-2/+7
* | | Merge pull request #6695 from kennyj/fix_6635Rafael Mendonça França2012-06-102-5/+14
* | | Merge pull request #6693 from jkraemer/3-2-stableJosé Valim2012-06-101-1/+1
|\ \ \
| * | | fix namespace collision with test-unit-activesupportJens Kraemer2012-06-101-1/+1
|/ / /
* | | Merge pull request #6687 from tiegz/3-2-optimizationsJosé Valim2012-06-091-1/+3
|\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 04:19:15 +0000