aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | Merge pull request #6789 from takoyakikamen/aptestsAaron Patterson2012-06-191-0/+1
| |\ \ \ \
| | * | | | Correct the AP test。タコ焼き仮面2012-06-191-0/+1
| |/ / / /
| * | | | Run the logger tests in isolationRafael Mendonça França2012-06-192-1/+3
| * | | | CORES needs to be a integerRafael Mendonça França2012-06-191-1/+1
| * | | | run the notes tests in isolationAaron Patterson2012-06-191-0/+4
|/ / / /
* | | | run railties tests in parallel, default to 2 coresAaron Patterson2012-06-192-2/+39
* | | | Merge branch 'aderyabin-fix7'Rafael Mendonça França2012-06-193-23/+67
|\ \ \ \
| * | | | Remove unneeded code since pluck is respecting joins nowRafael Mendonça França2012-06-191-12/+1
| * | | | Extract conditional to a method to avoid duplicationRafael Mendonça França2012-06-192-15/+22
| * | | | handle joins/includes correctly for pluck and calculation.Andrey Deryabin2012-06-192-1/+49
* | | | | Merge pull request #6787 from frodsan/add_nodoc_asset_helpersCarlos Antonio da Silva2012-06-193-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add :nodoc: to AV StylesheetIncludeTag, JavascriptIncludeTag and AssetIncludeTagFrancesco Rodriguez2012-06-193-4/+4
* | | | | join any extra args to the tmp pathAaron Patterson2012-06-191-0/+1
|/ / / /
* | | | expand the tmpdir to the realpath so tests on OS X passAaron Patterson2012-06-192-2/+2
* | | | Merge branch 'remote'Aaron Patterson2012-06-192-33/+22
|\ \ \ \
| * | | | move fanout back to a global variable, add a mutex for safetyAaron Patterson2012-06-192-33/+22