Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add :nodoc: to AM::AttributeMethods::AttributeMethodMatcher [ci skip] | Francesco Rodriguez | 2012-06-21 | 1 | -1/+1 |
| | |||||
* | Merge pull request #6804 from acapilleri/firm_changes_from_zero_to_string | Carlos Antonio da Silva | 2012-06-21 | 1 | -2/+2 |
|\ | | | | | changed the firm of changes_from_zero_to_string? | ||||
| * | changed the firm of changes_from_zero_to_string? | Angelo capilleri | 2012-06-21 | 1 | -2/+2 |
| | | | | | | | | delete *column* because is unused by the method. | ||||
* | | Merge pull request #6806 from chancancode/add_test_singularize_of_irregularity | Carlos Antonio da Silva | 2012-06-21 | 2 | -0/+12 |
|\ \ | | | | | | | Inflector: Added missing tests cases to ensure idempotency of singularize and pluralize | ||||
| * | | Adds missing inflector tests to ensure idempotency | Godfrey Chan | 2012-06-21 | 2 | -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_actionpack | Carlos Antonio da Silva | 2012-06-21 | 1 | -3/+3 |
|\ \ | |/ |/| | Removed warnings. | ||||
| * | Removed warnings. | Arun Agrawal | 2012-06-21 | 1 | -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 singleton | Aaron Patterson | 2012-06-20 | 1 | -11/+1 |
| | |||||
* | explain listener does not care about time, so use evented listener | Aaron Patterson | 2012-06-20 | 2 | -7/+10 |
| | |||||
* | use thread local queues. | Aaron Patterson | 2012-06-20 | 1 | -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_template | Rafael Mendonça França | 2012-06-20 | 11 | -3/+30 |
|\ | | | | | Mailer with no implicit template | ||||
| * | raise an error if no implicit mailer template could be found | Damien Mathieu | 2012-06-20 | 11 | -3/+30 |
|/ | |||||
* | Merge pull request #6799 from kennyj/refactor_long_codes | Rafael Mendonça França | 2012-06-20 | 1 | -132/+38 |
|\ | | | | | Refactor testcase codes. It's repeated. | ||||
| * | Refactor testcase codes. It's repeated. | kennyj | 2012-06-21 | 1 | -132/+38 |
|/ | |||||
* | Merge pull request #6798 from kennyj/db-rake-structure-load | Carlos Antonio da Silva | 2012-06-20 | 9 | -53/+133 |
|\ | | | | | Refactor db:structure:load task. | ||||
| * | Remove duplicated codes. | kennyj | 2012-06-21 | 1 | -41/+11 |
| | | |||||
| * | Refactor db:structure:load task. | kennyj | 2012-06-21 | 9 | -19/+129 |
| | | |||||
* | | Merge pull request #4396 from kennyj/fix_4259 | Rafael Mendonça França | 2012-06-20 | 2 | -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 ↵ | kennyj | 2012-01-10 | 2 | -4/+40 |
| | | | | | | | | we execute schema dumper. | ||||
* | | Merge pull request #6402 from paranoiase/prev-and-next-quarter | Carlos Antonio da Silva | 2012-06-20 | 12 | -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/DateTime | paranoiase Kang | 2012-06-20 | 7 | -0/+82 |
| | | | |||||
| * | | Merge pull request #6426 from pinetops/template_concurrency_master | Carlos Antonio da Silva | 2012-06-20 | 0 | -0/+0 |
| |\ \ | | | | | | | | | Prevent concurrent compilation of templates - closes #6400 | ||||
| | * | | Prevent concurrent compilation of templates - closes #6400 | Tom Clarke | 2012-05-21 | 1 | -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.0 | Santiago Pastorino | 2012-06-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #6789 from takoyakikamen/aptests | Aaron Patterson | 2012-06-19 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | Correct the AP test。 | ||||
| | * | | | Correct the AP test。 | タコ焼き仮面 | 2012-06-19 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | Run the logger tests in isolation | Rafael Mendonça França | 2012-06-19 | 2 | -1/+3 |
| | | | | |||||
| * | | | CORES needs to be a integer | Rafael Mendonça França | 2012-06-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | run the notes tests in isolation | Aaron Patterson | 2012-06-19 | 1 | -0/+4 |
|/ / / | |||||
* | | | run railties tests in parallel, default to 2 cores | Aaron Patterson | 2012-06-19 | 2 | -2/+39 |
| | | | |||||
* | | | Merge branch 'aderyabin-fix7' | Rafael Mendonça França | 2012-06-19 | 3 | -23/+67 |
|\ \ \ | | | | | | | | | | | | | Closes #6007 | ||||
| * | | | Remove unneeded code since pluck is respecting joins now | Rafael Mendonça França | 2012-06-19 | 1 | -12/+1 |
| | | | | |||||
| * | | | Extract conditional to a method to avoid duplication | Rafael Mendonça França | 2012-06-19 | 2 | -15/+22 |
| | | | | | | | | | | | | | | | | Also use if/else block to not use short circuit return | ||||
| * | | | handle joins/includes correctly for pluck and calculation. | Andrey Deryabin | 2012-06-19 | 2 | -1/+49 |
| | | | | | | | | | | | | | | | | Fix #5990 | ||||
* | | | | Merge pull request #6787 from frodsan/add_nodoc_asset_helpers | Carlos Antonio da Silva | 2012-06-19 | 3 | -4/+4 |
|\ \ \ \ | |/ / / |/| | | | | | | | add :nodoc: to AV StylesheetIncludeTag, JavascriptIncludeTag and AssetIncludeTag [ci skip] | ||||
| * | | | add :nodoc: to AV StylesheetIncludeTag, JavascriptIncludeTag and AssetIncludeTag | Francesco Rodriguez | 2012-06-19 | 3 | -4/+4 |
| | | | | |||||
* | | | | join any extra args to the tmp path | Aaron Patterson | 2012-06-19 | 1 | -0/+1 |
|/ / / | |||||
* | | | expand the tmpdir to the realpath so tests on OS X pass | Aaron Patterson | 2012-06-19 | 2 | -2/+2 |
| | | | |||||
* | | | Merge branch 'remote' | Aaron Patterson | 2012-06-19 | 2 | -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 safety | Aaron Patterson | 2012-06-19 | 2 | -33/+22 |
| | | | | |||||
* | | | | use system tmpdir rather than our own | Aaron Patterson | 2012-06-19 | 3 | -13/+26 |
| | | | | |||||
* | | | | make logger a singleton on the class | Aaron Patterson | 2012-06-19 | 1 | -3/+7 |
| | | | | |||||
* | | | | listeners are per thread, so remove nested hash | Aaron Patterson | 2012-06-19 | 1 | -6/+4 |
|/ / / | |||||
* | | | Add missing require | Rafael Mendonça França | 2012-06-19 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #6782 from kennyj/db-rake-structure-dump | Rafael Mendonça França | 2012-06-19 | 9 | -14/+147 |
|\ \ \ | | | | | | | | | Refactor db:structure:dump task. | ||||
| * | | | Refactor db:structure:dump task. | kennyj | 2012-06-20 | 9 | -14/+147 |
| | | | | |||||
* | | | | Merge pull request #6784 from msgehard/active_support_cleanup | Carlos Antonio da Silva | 2012-06-19 | 1 | -7/+4 |
|\ \ \ \ | | | | | | | | | | | Remove extra test case. | ||||
| * | | | | Remove extra test case. | Mike Gehard | 2012-06-19 | 1 | -7/+4 |
| |/ / / | | | | | | | | | | | | | Make the test description better reflect what is happening | ||||
* | | | | subscribers are per thread, so remove the nested hash access | Aaron Patterson | 2012-06-19 | 1 | -5/+3 |
| | | | | |||||
* | | | | documenting concurrency rules for the Fanout class | Aaron Patterson | 2012-06-19 | 1 | -0/+3 |
| | | | |