aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #11886 from jetthoughts/remove_redundant_assert_from_datat...Yves Senn2013-08-141-28/+28
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Removed redundant asserts for assigns attribute operationPaul Nikitochkin2013-08-141-28/+28
|/ / / / / / /
* | | | | | | document `assert_not_XYZ` in place of `refute_XYZ`.Yves Senn2013-08-141-10/+10
* | | | | | | Merge pull request #11617 from swooop/doc_sanitizeXavier Noria2013-08-141-0/+66
|\ \ \ \ \ \ \
| * | | | | | | Added SanitizeHelper to rails guide docs [ci skip]Toby Sims2013-07-291-0/+66
* | | | | | | | Merge pull request #11544 from prathamesh-sonpatki/namespaced_routes_testYves Senn2013-08-143-1/+58
|\ \ \ \ \ \ \ \
| * | | | | | | | Generate namespaced routes correctly for generators. Fix for #11532Prathamesh Sonpatki2013-08-143-1/+58
* | | | | | | | | test-case for fixed issue #11870.Yves Senn2013-08-141-0/+4
* | | | | | | | | Merge pull request #11756 from zilkey/masterYves Senn2013-08-131-0/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | added String#to_date documentation to Rails 4 upgrade guideJeff Dean2013-08-061-0/+13
* | | | | | | | | Merge pull request #11807 from jetthoughts/11804_actions_are_public_methodsSteve Klabnik2013-08-131-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | #11804: Add description of action in Getting Started GuidePaul Nikitochkin2013-08-131-0/+4
* | | | | | | | | | Merge pull request #11847 from AJ-Acevedo/masterSteve Klabnik2013-08-131-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Updated outdated initialization guide [ci skip]AJ Acevedo2013-08-131-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Add String#remove(pattern) as a short-hand for the common pattern of String#g...David Heinemeier Hansson2013-08-133-0/+19
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #11868 from rajcybage/fix_refuteRafael Mendonça França2013-08-132-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | using assert_not instead of refuteRajarshi Das2013-08-132-4/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #11861 from sadjow/improve-doc-translations-active-record-...José Valim2013-08-131-0/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add plural form example for AR I18n section [ci skip]Sadjow Leão2013-08-131-0/+13
|/ / / / / / / / /
* | | | | | | | | renames the :abort deprecation behaviour to :raiseXavier Noria2013-08-133-7/+7
* | | | | | | | | fixes typo in CHANGELOGXavier Noria2013-08-131-1/+1
* | | | | | | | | defines a new :abort deprecation behaviour that raisesXavier Noria2013-08-133-5/+46
* | | | | | | | | Merge pull request #11856 from dchelimsky/refactor-duration-inspectSteve Klabnik2013-08-121-7/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Refactor Duration#inspectDavid Chelimsky2013-08-121-7/+7
|/ / / / / / / / /
* | | | | | | | | Merge pull request #11855 from dchelimsky/chop-is-fasterRafael Mendonça França2013-08-121-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use chop instead of singularize in Duration#inspectDavid Chelimsky2013-08-121-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #11823 from fomede/add-jquery-ujs-reference-linkSteve Klabnik2013-08-121-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add events reference link to the text about jquery-ujs [ci skip]Sadjow Leão2013-08-121-1/+1
* | | | | | | | | | Merge pull request #11852 from prijutme4ty/guide_additionSteve Klabnik2013-08-121-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added comment to a guide about necessity of `:dependent` option for associati...Ilya Vorontsov2013-08-121-0/+6
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #11838 from vipulnsward/drop_extra_varSteve Klabnik2013-08-121-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | drop extra variableVipul A M2013-08-121-2/+2
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Use assert_not rather than refutePiotr Sarnacki2013-08-121-5/+5
* | | | | | | | | | Merge pull request #11525 from Empact/nested_attributes_with_callbacks_bugPiotr Sarnacki2013-08-124-11/+172
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Refactor NestedAttributesWithCallbacksTest for clarityBen Woosley2013-08-121-67/+66
| * | | | | | | | | Restore the use of `#add_to_target` for nested attribute updates on existing ...Ben Woosley2013-08-123-15/+20
| * | | | | | | | | Fix interactions between :before_add callbacks and nested attributes assignmentDr.(USA) Joerg Schray2013-08-123-11/+168
|/ / / / / / / / /
* | | | | | | | | Merge pull request #11846 from gaurish/jdbc-upgradeGuillermo Iguaran2013-08-111-6/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Upgrade ActiveRecord-JDBC-Adapter to master branchGaurish Sharma2013-08-121-6/+7
* | | | | | | | | | chmod -xAkira Matsuda2013-08-124-0/+0
|/ / / / / / / / /
* | | | | | | | | only reconnect if there was already an active connectionAaron Patterson2013-08-111-1/+4
* | | | | | | | | Merge pull request #11826 from etipton/enable_extensions_revertibleRafael Mendonça França2013-08-103-1/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make 'enable_extension' revertibleEric Tipton2013-08-103-1/+16
| |/ / / / / / / /
* | | | | | | | | Merge pull request #11799 from njakobsen/fix-controller-filter-callbacksRafael Mendonça França2013-08-103-1/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Execute conditional procs on controller filters only for current action.Nicholas Jakobsen2013-08-103-1/+17
* | | | | | | | | | Merge pull request #11830 from cr0t/masterJosé Valim2013-08-101-0/+8
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add author_name field to post_params to the engines docsSergey Kuznetsov2013-08-101-0/+8
|/ / / / / / / / /
* | | | | | | | | Merge pull request #11820 from vipulnsward/remove_s2bRafael Mendonça França2013-08-096-37/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove redundant `string_to_binary` from type-castingVipul A M2013-08-096-37/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #11815 from yaotti/patch-1Yves Senn2013-08-081-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |