aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* adds a missing require [fixes #6896]Xavier Noria2012-07-152-1/+1
* fixing tests to deal with data differences between prepared statements and no...Aaron Patterson2012-07-133-3/+8
* Fixing texts; down to three failing tests.Jeremy Cole2012-07-132-15/+24
* Only use prepared statements when bind variables are presentJeremy Cole2012-07-131-34/+40
* Merge pull request #7031 from robbkidd/rename_sequences_too_backport_to_3-2Piotr Sarnacki2012-07-112-0/+27
|\
| * Update psql adapter to rename a default pkey sequence during rename_table.Robb Kidd2012-07-102-0/+27
|/
* Merge pull request #7025 from rustygeldmacher/select_options_valid_htmlRafael Mendonça França2012-07-102-5/+18
|\
| * Fixed bug creating invalid HTML in select optionsRusty Geldmacher2012-07-102-5/+18
|/
* Merge pull request #7015 from sikachu/3-2-stable-code-styleXavier Noria2012-07-091-8/+8
|\
| * Update coding convention from masterPrem Sichanugrist2012-07-091-8/+8
|/
* Merge pull request #6985 from sidonath/disable-query-cache-for-locksRafael Mendonça França2012-07-062-1/+17
* Since Rails 3.2, use layout false to render no layoutJosé Valim2012-07-061-1/+1
* Merge pull request #6973 from route/wrapped_keys_in_log_for_3_2Rafael Mendonça França2012-07-052-1/+10
|\
| * Show in log correct wrapped keysDmitry Vorotilin2012-07-052-1/+10
|/
* Fix NumberHelper options wrapping to prevent verbatim blocks being rendered i...Mark J. Titorenko2012-07-021-90/+159
* Merge pull request #6935 from frodsan/b1e509ad7a8c8264544f10f4666705cd806b5408Rafael Mendonça França2012-07-022-15/+31
|\
| * Backport #3329 to 3-2-stableFrancesco Rodriguez2012-07-022-15/+31
|/
* make sure the inflection rules are loaded when cherry-picking active_support/...Xavier Noria2012-06-293-0/+5
* Merge pull request #6878 from masarakki/masterRafael Mendonça França2012-06-285-0/+41
* Merge pull request #6900 from cbandy/issue-6898Carlos Antonio da Silva2012-06-281-0/+2
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 11:14:16 +0000