Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #15859 from zuhao/refactor_activesupport_caching_test | Yves Senn | 2014-06-22 | 1 | -14/+13 |
|\ | | | | | Create with_env helper for tests. | ||||
| * | Create with_env helper for tests. | Zuhao Wan | 2014-06-22 | 1 | -14/+13 |
|/ | |||||
* | Merge pull request #15839 from sgrif/sg-attr-set-null | Yves Senn | 2014-06-22 | 6 | -12/+17 |
|\ | | | | | Return a null object from `AttributeSet#[]` | ||||
| * | Return a null object from `AttributeSet#[]` | Sean Griffin | 2014-06-20 | 6 | -12/+17 |
| | | |||||
* | | Merge pull request #15849 from sgrif/sg-move-attributes | Yves Senn | 2014-06-22 | 3 | -3/+14 |
|\ \ | | | | | | | Move `attributes` to the `AttributeSet` object. | ||||
| * | | Move `attributes` to the `AttributeSet` object. | Sean Griffin | 2014-06-21 | 3 | -3/+14 |
| | | | |||||
* | | | Merge pull request #15850 from sgrif/sg-missing-tests | Yves Senn | 2014-06-22 | 1 | -0/+11 |
|\ \ \ | | | | | | | | | Add missing test cases for `attribute_method?` | ||||
| * | | | Add missing test cases for `attribute_method?` | Sean Griffin | 2014-06-21 | 1 | -0/+11 |
| |/ / | |||||
* | | | Merge pull request #15856 from zuhao/refactor_activesupport_decoding_test | Yves Senn | 2014-06-22 | 1 | -11/+19 |
|\ \ \ | | | | | | | | | Use with_parse_json_times helper in tests. | ||||
| * | | | Use with_parse_json_times helper in tests. | Zuhao Wan | 2014-06-22 | 1 | -11/+19 |
| |/ / | |||||
* | | | Merge pull request #15857 from zuhao/refactor_activesupport_encoding_test | Yves Senn | 2014-06-22 | 1 | -14/+19 |
|\ \ \ | |/ / |/| | | Avoid hardcoded magic number in test teardown. | ||||
| * | | Avoid hardcoded magic number in test teardown. | Zuhao Wan | 2014-06-22 | 1 | -14/+19 |
|/ / | |||||
* | | :nail_care: wrap the tip from #15624 at 80 chars [ci skip] | Zachary Scott | 2014-06-20 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #15624 from aditya-kapoor/add-warnings-on-guides | Zachary Scott | 2014-06-20 | 1 | -0/+2 |
|\ \ | |/ |/| | [ci skip] Add Tip for change_column_null and change_column_default in guides | ||||
| * | [ci skip] Add Tip for change_column_null and change_column_default in guides | Aditya Kapoor | 2014-06-21 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #15764 from arthurnn/dependencies_name_error | Matthew Draper | 2014-06-21 | 3 | -5/+11 |
|\ \ | | | | | | | Make dependencies.rb add a name to NameError | ||||
| * | | Add regression test for NameError#name | Arthur Neves | 2014-06-20 | 2 | -2/+5 |
| | | | |||||
| * | | Make dependencies.rb add a name to NameError | Arthur Neves | 2014-06-20 | 2 | -4/+7 |
|/ / | |||||
* | | docs, configurations method is listed in the docs. [ci skip] | Yves Senn | 2014-06-20 | 1 | -1/+0 |
| | | | | | | | | | | The :singleton-method: directive is printed in the docs. This directive is not necessary as the method is documentable just fine. | ||||
* | | Merge pull request #15809 from maurogeorge/guides-console-app | Yves Senn | 2014-06-20 | 1 | -0/+25 |
|\ \ | | | | | | | Add to guides app and helper objects on command line | ||||
| * | | Add to guides app and helper objects on command line | Mauro George | 2014-06-19 | 1 | -0/+25 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #15537 from tgxworld/fix_state_leak | Matthew Draper | 2014-06-20 | 4 | -5/+5 |
|\ \ \ | | | | | | | | | Fix state leak. | ||||
| * | | | Remove redundant code. | Guo Xiang Tan | 2014-06-05 | 1 | -4/+0 |
| | | | | |||||
| * | | | Prevent state leak. | Guo Xiang Tan | 2014-06-05 | 4 | -1/+5 |
| | | | | |||||
* | | | | Merge pull request #15824 from bhicks/remove-extra-list-item-element | Sean Griffin | 2014-06-19 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Remove extra list item element in engine guide | ||||
| * | | | | Remove extra list item element | Ben Hicks | 2014-06-19 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaning up the list items that detail what an engines `--full` option generates. Joining a multiline multi list item into a multiline single list item. [ci skip] | ||||
* | | | | add both branches to the only_path conditional | Aaron Patterson | 2014-06-19 | 1 | -6/+6 |
| | | | | |||||
* | | | | Merge pull request #15728 from sgrif/sg-double-save-hm-t | Rafael Mendonça França | 2014-06-19 | 3 | -4/+30 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't save through records twice Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/associations/has_many_through_associations_test.rb | ||||
| * | | | | Don't save through records twice | Sean Griffin | 2014-06-17 | 3 | -3/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the through record gets created in an `after_create` hook that is defined before the association is defined (therefore after its `after_create` hook) get saved twice. This ensures that the through records are created only once, regardless of the order of the hooks. | ||||
* | | | | | Merge pull request #15823 from ↵ | Rafael Mendonça França | 2014-06-19 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | yuki24/better-docmentation-for-dynamic-error-pages ErrorsController shouldn't inherit ApplicationController, but ActionController | ||||
| * | | | | | ErrorsController shouldn't inherit ApplicationController, but ↵ | Yuki Nishijima | 2014-06-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionController::Base Inheriting `ApplicationController` often causes an issue as it always has before/after actions. It should encourage to use `ActionController::Base` instead. [ci skip] | ||||
* | | | | | | Merge pull request #15747 from sgrif/sg-trolololol-this-is-so-broken | Rafael Mendonça França | 2014-06-19 | 3 | -1/+56 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Always update counter caches in memory when adding records | ||||
| * | | | | | | Always update counter caches in memory when adding records | Sean Griffin | 2014-06-16 | 3 | -1/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, calling `size` would only work if it skipped the cache, and would return a different result from the cache, but only if: - The association was previously loaded - Or you called size previously - But only if the size was 0 when you called it This ensures that the counter is appropriately updated in memory. | ||||
* | | | | | | | Merge pull request #15800 from sgrif/sg-column-in-calculation | Rafael Mendonça França | 2014-06-19 | 2 | -17/+8 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Don't use `Column` for type casting in Relation calculations | ||||
| * | | | | | | | Don't use `Column` for type casting in Relation calculations | Sean Griffin | 2014-06-18 | 2 | -17/+8 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #15801 from sgrif/sg-column-defaults | Rafael Mendonça França | 2014-06-19 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Don't use column object when calculating type cast defaults | ||||
| * | | | | | | | | Don't use column object when calculating type cast defaults | Sean Griffin | 2014-06-18 | 1 | -2/+2 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Moves towards removing type casting knowledge from the column entirely | ||||
* | | | | | | | | Merge pull request #15802 from sgrif/sg-column-quoting | Rafael Mendonça França | 2014-06-19 | 3 | -31/+6 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Don't use column object for type casting in `quoting` | ||||
| * | | | | | | | | Don't use column object for type casting in `quoting` | Sean Griffin | 2014-06-18 | 3 | -31/+6 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're never going to be able to use the attribute object here, however, so let's just accept the ugly demeter violation here for now. Remove test cases which were either redundant with other tests in the file, or were actually testing the type objects (which are tested elsewhere) | ||||
* | | | | | | | | Merge pull request #15803 from sgrif/sg-column-in-associations | Rafael Mendonça França | 2014-06-19 | 3 | -5/+5 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Don't rely on the column for type casting reflections | ||||
| * | | | | | | | | Don't rely on the column for type casting reflections | Sean Griffin | 2014-06-18 | 3 | -5/+5 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #15814 from sgrif/sg-number-changed | Rafael Mendonça França | 2014-06-19 | 1 | -12/+6 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Further simplify `changed?` conditional for numeric types | ||||
| * | | | | | | | Further simplify `changed?` conditional for numeric types | Sean Griffin | 2014-06-19 | 1 | -12/+6 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Type::Integer.new.type_cast('') # => nil`, we do not need a special case to handle this, `nil => ''` already returns false. The only case we need to handle is `0 => 'wibble'` should be changed, while `0 => '0'` should not. | ||||
* | | | | | | | Merge pull request #15450 from aditya-kapoor/remove-nbsp-debug | Rafael Mendonça França | 2014-06-19 | 2 | -7/+7 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | remove unnecessary gsub for space in ActionView::Helpers#debug | ||||
| * | | | | | | | remove unnecessary substitution for space in ActionView::Helpers#debug | Aditya Kapoor | 2014-06-14 | 2 | -7/+7 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #15818 from sgrif/sg-attribute-set | Rafael Mendonça França | 2014-06-19 | 8 | -23/+120 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Introduce an object to aid in creation and management of `@attributes` | ||||
| * | | | | | | | | Introduce an object to aid in creation and management of `@attributes` | Sean Griffin | 2014-06-19 | 8 | -23/+120 |
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly delegation to start, but we can start moving a lot of behavior in bulk to this object. | ||||
* | | | | | | | | Merge pull request #15808 from maurogeorge/guides-custom-errors-page | Eileen M. Uchitelle | 2014-06-19 | 1 | -0/+55 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Create custom errors page on ActionController guides | ||||
| * | | | | | | | | Create custom errors page on ActionController guides | Mauro George | 2014-06-19 | 1 | -0/+55 |
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | | Merge pull request #15820 from lucasmazza/lm-except-highlight-tweaks | Rafael Mendonça França | 2014-06-19 | 3 | -7/+50 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | highlight/except support for regular expressions and blocks. |