aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add :nodoc: to AM::AttributeMethods::AttributeMethodMatcher [ci skip]Francesco Rodriguez2012-06-211-1/+1
|
* 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?
| * changed the firm of changes_from_zero_to_string?Angelo capilleri2012-06-211-2/+2
| | | | | | | | delete *column* because is unused by the method.
* | Merge pull request #6806 from chancancode/add_test_singularize_of_irregularityCarlos Antonio da Silva2012-06-212-0/+12
|\ \ | | | | | | Inflector: Added missing tests cases to ensure idempotency of singularize and pluralize
| * | Adds missing inflector tests to ensure idempotencyGodfrey Chan2012-06-212-0/+12
| |/ | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up to #4719. It appears that singularize and pluralize are supposed to be idempotent - i.e. when you call singularize or pluralize multiple times on the same string, you should get the same result. (At least for the "officially supported" cases that the stock inflector is designed to handle.) #4719 added the missing tests for regular cases, and this commit added the missing tests for the irregularities. While I'm at that, I also synced up the irregularity test cases with the current set of irregularity cases that we ship out-of-the-box.
* | Merge pull request #6808 from arunagw/warning_removed_actionpackCarlos Antonio da Silva2012-06-211-3/+3
|\ \ | |/ |/| Removed warnings.
| * Removed warnings.Arun Agrawal2012-06-211-3/+3
|/ | | | | 1. Change in test name as already defined. 2. ambiguous first argument; put parentheses or even spaces
* 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
| | | | | Log listener is a singleton shared across threads, so make sure the event queues are local to each thread.
* Merge pull request #6801 from dmathieu/mailer_raise_if_no_implicit_templateRafael Mendonça França2012-06-2011-3/+30
|\ | | | | Mailer with no implicit template
| * 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.
| * 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
|\ | | | | Refactor db:structure:load task.
| * 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. When we execute schema dumper, we must remove table_name_prefix and table_name_suffix.
| * Fix GH #4259. We must remove table_name_prefix and table_name_suffix, when ↵kennyj2012-01-102-4/+40
| | | | | | | | we execute schema dumper.
* | Merge pull request #6402 from paranoiase/prev-and-next-quarterCarlos Antonio da Silva2012-06-2012-2/+91
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add prev_quarter and next_quarter methods in Time/Date/DateTime calculations. Similar to prev_month and next_month, it returns the date with the same day in the previous or next quarter: t = Time.local(2010, 5, 8) # => Sat, 08 May 2010 t.prev_quarter # => Mon, 08 Feb 2010 t.next_quarter # => Sun, 08 Aug 2010 Closes #6402
| * | 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 #6400
| | * | Prevent concurrent compilation of templates - closes #6400Tom Clarke2012-05-211-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This addresses an issue where in multi-threaded environments multiple threads can attempt to compile a template at the same time, which occasionally causes particular templates to end up in a bad state. So, add synchronization such that only a single thread can attempt to compile a template at one time.
| * | | 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。
| | * | | 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
|\ \ \ | | | | | | | | | | | | Closes #6007
| * | | 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
| | | | | | | | | | | | | | | | Also use if/else block to not use short circuit return
| * | | handle joins/includes correctly for pluck and calculation.Andrey Deryabin2012-06-192-1/+49
| | | | | | | | | | | | | | | | Fix #5990
* | | | Merge pull request #6787 from frodsan/add_nodoc_asset_helpersCarlos Antonio da Silva2012-06-193-4/+4
|\ \ \ \ | |/ / / |/| | | | | | | add :nodoc: to AV StylesheetIncludeTag, JavascriptIncludeTag and AssetIncludeTag [ci skip]
| * | | 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
|\ \ \ | | | | | | | | | | | | | | | | * remote: move fanout back to a global variable, add a mutex for safety
| * | | move fanout back to a global variable, add a mutex for safetyAaron Patterson2012-06-192-33/+22
| | | |
* | | | use system tmpdir rather than our ownAaron Patterson2012-06-193-13/+26
| | | |
* | | | make logger a singleton on the classAaron Patterson2012-06-191-3/+7
| | | |
* | | | listeners are per thread, so remove nested hashAaron Patterson2012-06-191-6/+4
|/ / /
* | | Add missing requireRafael Mendonça França2012-06-191-0/+2
| | |
* | | Merge pull request #6782 from kennyj/db-rake-structure-dumpRafael Mendonça França2012-06-199-14/+147
|\ \ \ | | | | | | | | Refactor db:structure:dump task.
| * | | Refactor db:structure:dump task.kennyj2012-06-209-14/+147
| | | |
* | | | Merge pull request #6784 from msgehard/active_support_cleanupCarlos Antonio da Silva2012-06-191-7/+4
|\ \ \ \ | | | | | | | | | | Remove extra test case.
| * | | | Remove extra test case.Mike Gehard2012-06-191-7/+4
| |/ / / | | | | | | | | | | | | Make the test description better reflect what is happening
* | | | subscribers are per thread, so remove the nested hash accessAaron Patterson2012-06-191-5/+3
| | | |
* | | | documenting concurrency rules for the Fanout classAaron Patterson2012-06-191-0/+3
| | | |