aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Extend assets cache store section in Assets Pipeline Guide [ci skip]Andrey Vakarev2012-06-161-3/+18
| * Add rdoc to phone_field Gaurish Sharma2012-06-161-0/+1
| * add example to ActiveModel::Validations#validators [ci skip]Francesco Rodriguez2012-06-152-3/+15
| * included another upgrading pinfall - accidentally having duplicate js filesCasey Watts2012-06-151-2/+8
* | Merge pull request #6800 from mschneider/dynamic_finders_for_aliased_attributesRafael Mendonça França2012-06-227-2/+27
|\ \
| * | made dynamic finders alias_attribute awareMaximilian Schneider2012-06-227-2/+27
* | | Fix changelog typo [ci skip]Carlos Antonio da Silva2012-06-221-1/+1
* | | Merge branch 'pluck-multiple-columns'Carlos Antonio da Silva2012-06-224-28/+76
|\ \ \
| * | | Add changelog entry and guide updates for pluck with multiple columnsCarlos Antonio da Silva2012-06-223-6/+26
| * | | Refactor pluck with multiple columnsCarlos Antonio da Silva2012-06-222-36/+29
| * | | ActiveRecord#pluck now accepts multiple columnsjeroeningen2012-06-222-16/+51
|/ / /
* | | Fix serializable_hash with xml generation and default :except optionCarlos Antonio da Silva2012-06-223-5/+30
* | | Add some coverage for AR serialization with serializable_hashCarlos Antonio da Silva2012-06-224-27/+114
* | | disallow mutating a relation once loadedJon Leighton2012-06-223-18/+50
* | | It's AR::Reflection not AR::RelationAndrew White2012-06-221-1/+1
* | | Improve the derivation of HABTM assocation join table namesAndrew White2012-06-2213-52/+85
* | | Set the hash value directly instead of using merge!Carlos Antonio da Silva2012-06-211-1/+1
* | | Merge pull request #6818 from frodsan/add_nodoc_instancemethodRafael Mendonça França2012-06-211-1/+1
|\ \ \
| * | | add :nodoc: to AM::AttributeMethods#instance_method_already_implemented? [ci ...Francesco Rodriguez2012-06-211-1/+1
|/ / /
* | | use mutex_m rather than use a delegate systemAaron Patterson2012-06-211-6/+3
* | | Merge pull request #6428 from pinetops/resolver_concurrency_fixYehuda Katz2012-06-212-23/+80
|\ \ \
| * | | Improve the readability of the Resolver change detection codeTom Clarke2012-05-221-11/+19
| * | | More granular locking of the Resolver template cacheTom Clarke2012-05-211-5/+23
| * | | Make the Resolver template cache threadsafe - closes #6404Tom Clarke2012-05-212-23/+54
* | | | Merge pull request #6815 from frodsan/add_nodoc_attrmethodmatcherRafael Mendonça França2012-06-211-1/+1
|\ \ \ \
| * | | | add :nodoc: to AM::AttributeMethods::AttributeMethodMatcher [ci skip]Francesco Rodriguez2012-06-211-1/+1
* | | | | stop subclassing stringAaron Patterson2012-06-212-4/+11
|/ / / /
* | | | Merge pull request #6804 from acapilleri/firm_changes_from_zero_to_stringCarlos Antonio da Silva2012-06-211-2/+2
|\ \ \ \
| * | | | changed the firm of changes_from_zero_to_string?Angelo capilleri2012-06-211-2/+2
* | | | | Merge pull request #6806 from chancancode/add_test_singularize_of_irregularityCarlos Antonio da Silva2012-06-212-0/+12
|\ \ \ \ \
| * | | | | Adds missing inflector tests to ensure idempotencyGodfrey Chan2012-06-212-0/+12
| |/ / / /
* | | | | Merge pull request #6808 from arunagw/warning_removed_actionpackCarlos Antonio da Silva2012-06-211-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Removed warnings.Arun Agrawal2012-06-211-3/+3
|/ / / /
* | | | logger is a singleton, just flush the singletonAaron Patterson2012-06-201-11/+1
* | | | explain listener does not care about time, so use evented listenerAaron Patterson2012-06-202-7/+10
* | | | use thread local queues.Aaron Patterson2012-06-201-4/+10
* | | | Merge pull request #6801 from dmathieu/mailer_raise_if_no_implicit_templateRafael Mendonça França2012-06-2011-3/+30
|\ \ \ \
| * | | | raise an error if no implicit mailer template could be foundDamien Mathieu2012-06-2011-3/+30
|/ / / /
* | | | Merge pull request #6799 from kennyj/refactor_long_codesRafael Mendonça França2012-06-201-132/+38
|\ \ \ \ | |_|/ / |/| | |
| * | | Refactor testcase codes. It's repeated.kennyj2012-06-211-132/+38
|/ / /
* | | Merge pull request #6798 from kennyj/db-rake-structure-loadCarlos Antonio da Silva2012-06-209-53/+133
|\ \ \
| * | | Remove duplicated codes.kennyj2012-06-211-41/+11
| * | | Refactor db:structure:load task.kennyj2012-06-219-19/+129
* | | | Merge pull request #4396 from kennyj/fix_4259Rafael Mendonça França2012-06-202-4/+40
|\ \ \ \ | |/ / / |/| | |
| * | | Fix GH #4259. We must remove table_name_prefix and table_name_suffix, when we...kennyj2012-01-102-4/+40
* | | | Merge pull request #6402 from paranoiase/prev-and-next-quarterCarlos Antonio da Silva2012-06-2012-2/+91
|\ \ \ \
| * | | | Add prev_quarter and next_quarter method in Time/Date/DateTimeparanoiase Kang2012-06-207-0/+82
| * | | | Merge pull request #6426 from pinetops/template_concurrency_masterCarlos Antonio da Silva2012-06-200-0/+0
| |\ \ \ \
| | * | | | Prevent concurrent compilation of templates - closes #6400Tom Clarke2012-05-211-10/+22
| * | | | | Bump minitest to 3.1.0Santiago Pastorino2012-06-201-1/+1