Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Should escape regexp wildcard character `.` | Ryuta Kamizono | 2015-01-19 | 14 | -34/+34 |
| | | | | | `.` is regexp meta character. It should be escape for `assert_match` correctly. | ||||
* | Don't calculate in-place changes on attribute assignment | Sean Griffin | 2015-01-18 | 3 | -1/+10 |
| | | | | | | | | | | | When an attribute is assigned, we determine if it was already marked as changed so we can determine if we need to clear the changes, or mark it as changed. Since this only affects the `attributes_changed_by_setter` hash, in-place changes are irrelevant to this process. Since calculating in-place changes can be expensive, we can just skip it here. I also added a test for the only edge case I could think of that would be affected by this change. | ||||
* | Use bundler 1.7 on travis | Sean Griffin | 2015-01-18 | 1 | -0/+1 |
| | |||||
* | Include stackprof on ruby 2.2 as well as 2.1 | Sean Griffin | 2015-01-18 | 1 | -1/+1 |
| | |||||
* | Merge pull request #18576 from yui-knk/fix/autoload4 | Santiago Pastorino | 2015-01-18 | 1 | -3/+2 |
|\ | | | | | [ci skip] Move a introduction of `Module.nesting` | ||||
| * | [ci skip] Move a introduction of `Module.nesting` | yui-knk | 2015-01-18 | 1 | -3/+2 |
| | | | | | | | | | | Move a introduction of `Module.nesting` to the beginning of sentence. This change will help reader to try to dump `nesting`. | ||||
* | | Merge pull request #18579 from ↵ | Santiago Pastorino | 2015-01-18 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | prathamesh-sonpatki/use-existing-constant-for-join Use existing constant for joining instead of '_' | ||||
| * | | Use existing constant for joining instead of '_' | Prathamesh Sonpatki | 2015-01-18 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #18578 from y-yagi/remove_logger_extensions | Abdelkader Boudih | 2015-01-18 | 1 | -44/+0 |
|\ \ \ | |/ / |/| | | remove reference to `Logger` core extensions from guide [ci skip] | ||||
| * | | remove reference to `Logger` core extensions from guide [ci skip] | yuuji.yaginuma | 2015-01-18 | 1 | -44/+0 |
| | | | |||||
* | | | Merge pull request #18577 from prathamesh-sonpatki/nodoc-av-modelnaming | Guillermo Iguaran | 2015-01-18 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | nodoc ActionView::ModelNaming module | ||||
| * | | nodoc ActionView::ModelNaming module | Prathamesh Sonpatki | 2015-01-18 | 1 | -1/+1 |
|/ / | | | | | | | | | - Its only used by ActionView internals and not supposed to be used through public API. | ||||
* | | Merge pull request #18575 from yui-knk/fix/autoload | Zachary Scott | 2015-01-17 | 1 | -5/+5 |
|\ \ | |/ |/| | [ci skip] fix positions of parentheses | ||||
| * | [ci skip] fix positions of parentheses | yui-knk | 2015-01-18 | 1 | -5/+5 |
|/ | |||||
* | Merge pull request #18569 from yuki24/eliminate-warning-in-action-view-test | Yves Senn | 2015-01-17 | 1 | -1/+5 |
|\ | | | | | Eliminate a ruby warning in a test in Action View | ||||
| * | Eliminate a ruby warning in a test in Action View | Yuki Nishijima | 2015-01-17 | 1 | -1/+5 |
|/ | | | | | | | This eliminates the warning below: actionview/test/template/form_helper_test.rb:913: warning: method redefined; discarding old id_came_from_user? actionview/test/template/form_helper_test.rb:104: warning: previous definition of id_came_from_user? was here | ||||
* | Merge pull request #18567 from prathamesh-sonpatki/fix-assert-welcome-test | Richard Schneeman | 2015-01-17 | 1 | -1/+2 |
|\ | | | | | Fixed test for assert_welcome | ||||
| * | Fixed test for assert_welcome | Prathamesh Sonpatki | 2015-01-17 | 1 | -1/+2 |
| | | | | | | | | - Test was wrongly using assert with assignment statement. | ||||
* | | bring back unintentionally removed blank line [ci skip] | Yves Senn | 2015-01-17 | 1 | -0/+1 |
| | | | | | | | | Thanks @carlosantoniodasilva :yellow_heart: | ||||
* | | Merge pull request #18568 from vipulnsward/removed-deprecated-methods-from-docs | Zachary Scott | 2015-01-17 | 1 | -18/+2 |
|\ \ | |/ |/| | Removed documentation of deprecated removed methods | ||||
| * | Removed documentation of deprecated removed methods [ci skip] | Vipul A M | 2015-01-17 | 1 | -18/+2 |
| | | |||||
* | | Merge pull request #18566 from yuki24/fix-assertion-in-ar-case-date-time | Carlos Antonio da Silva | 2015-01-17 | 1 | -1/+1 |
|\ \ | | | | | | | Fix a false assertion | ||||
| * | | Fix a false assertion | Yuki Nishijima | 2015-01-17 | 1 | -1/+1 |
|/ / | | | | | | | #assert was used when it should be assert_equal. | ||||
* | | Merge pull request #18564 from yui-knk/fix/autoload2 | Abdelkader Boudih | 2015-01-17 | 1 | -1/+1 |
|\ \ | |/ |/| | [ci skip] Change to the passive voice | ||||
| * | [ci skip] Change to the passive voice | yui-knk | 2015-01-17 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #18493 from twoller/master | Yves Senn | 2015-01-17 | 2 | -10/+10 |
|\ | | | | | Consistent anchor text in nav links, new image [ci skip] | ||||
| * | Use consistent anchor text throughout the guide. | Toby Woller | 2015-01-15 | 2 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | Change all of anchor text in the nav links to `Back` and `Edit` Use `Edit | Back` on pages that use both links to conform to what scaffolding generates. Use consistent anchor text throughout the guide. Change all of anchor text in the nav links to `Back` and `Edit` Use `Edit | Back` on pages that use both links to conform to what scaffolding generates. | ||||
* | | Merge pull request #18558 from robertomiranda/patch-3 [ci skip] | Yves Senn | 2015-01-17 | 1 | -2/+6 |
|\ \ | | | | | | | | | | Update Molde Generator Usage | ||||
| * | | Update Molde Generator Usage | Roberto Miranda | 2015-01-16 | 1 | -0/+5 |
| | | | | | | | | | Including has_secure_token generator | ||||
* | | | Merge pull request #18554 from mechanicles/use-take-method | Santiago Pastorino | 2015-01-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | A little performance improvement using 'take' method over 'first' | ||||
| * | | | A little performance improvement using 'take' method over 'first' | Santosh Wadghule | 2015-01-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #18562 from vipulnsward/fix-broken-hwai-frozen-tet | Santiago Pastorino | 2015-01-17 | 2 | -7/+9 |
|\ \ \ \ | | | | | | | | | | | Fix hwia isolated tests | ||||
| * | | | | - Moved hwia frozen value assignment test to hash_ext_test similar to other ↵ | Vipul A M | 2015-01-17 | 2 | -7/+9 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | tests - Fixed the wrong use of with_indifferent_access on hash in the test which failed for isolated tests - Renamed to appropriately specify what the test does | ||||
* | | | | Merge pull request #18560 from ogennadi/patch-2 | Abdelkader Boudih | 2015-01-17 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fixed extraneous quoting | ||||
| * | | | | Fixed extraneous quoting | Oge Nnadi | 2015-01-16 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #18559 from ogennadi/patch-1 | Zachary Scott | 2015-01-16 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | Typo fix | ||||
| * | | | Typo fix | Oge Nnadi | 2015-01-16 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #18551 from aditya-kapoor/fix-frozen-hwia | Andrew White | 2015-01-16 | 3 | -1/+15 |
|\ \ \ | | | | | | | | | Fix assignment for frozen value in HWIA | ||||
| * | | | Fix assignment for frozen value in HWIA | Aditya Kapoor | 2015-01-17 | 3 | -1/+15 |
| |/ / | |||||
* | | | Merge pull request #18556 from jfine/patch-1 | Rafael Mendonça França | 2015-01-16 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Underscore typo [ci skip] | ||||
| * | | | Underscore typo [ci skip] | Jared Fine | 2015-01-16 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #18437 from eldano/feed_entry_no_link_option | Santiago Pastorino | 2015-01-16 | 3 | -2/+30 |
|\ \ \ | | | | | | | | | Use option url: false to allow entries without a link tag | ||||
| * | | | Use option url: false to allow entries without a link tag | Daniel Gomez de Souza | 2015-01-16 | 3 | -2/+30 |
|/ / / | |||||
* / / | Specify correct version in the changelog [ci skip] | Sean Griffin | 2015-01-16 | 1 | -1/+1 |
|/ / | |||||
* | | docs, update "How to run Active Record tests". [ci skip] | Yves Senn | 2015-01-15 | 1 | -1/+5 |
| | | |||||
* | | Merge pull request #18543 from henrik/integer_limit_or_default | Yves Senn | 2015-01-15 | 1 | -2/+6 |
|\ \ | | | | | | | Tiny: DRY default limit in ActiveRecord::Type::Integer | ||||
| * | | DRY default limit in ActiveRecord::Type::Integer | Henrik Nyh | 2015-01-15 | 1 | -2/+6 |
| | | | |||||
* | | | Merge pull request #18544 from henrik/ar_type_value_comment | Rafael Mendonça França | 2015-01-15 | 1 | -2/+1 |
|\ \ \ | |/ / |/| | | Tiny: Remove incorrect comment in ActiveRecord::Type::Value | ||||
| * | | Remove incorrect comment in ActiveRecord::Type::Value | Henrik Nyh | 2015-01-15 | 1 | -2/+1 |
|/ / | | | | | | | | | | | | | Says it's only used for the schema, but they are in fact used for other things. Integer verifies against the limit during casting, and Decimal uses precision during casting. It may be true that scale is only used for the schema. | ||||
* | | Merge pull request #18541 from andreynering/getting-started-javascript | Abdelkader Boudih | 2015-01-15 | 1 | -0/+3 |
|\ \ | | | | | | | Adding tip about jQuery UJS [ci skip] |