| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | Variants can be declared without a block to signify their presence in the ↵ | David Heinemeier Hansson | 2013-12-07 | 3 | -2/+5 | |
| | | | | | | | | | | | | | | | | | | | | | controller | |||||
| * | | | | | Allow code execution in case no variant has been set with variant.none | David Heinemeier Hansson | 2013-12-07 | 2 | -4/+21 | |
| | |_|_|/ |/| | | | ||||||
| * | | | | Merge pull request #13221 from stereoscott/patch-1 | Godfrey Chan | 2013-12-06 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | fix tiny typo in comment, "state_state" should be "stale_state" [ci skip] | |||||
| | * | | | | fix typo, "state_state" should be "stale_state" [ci skip] | Scott M | 2013-12-07 | 1 | -1/+1 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #13219 from robin850/patch-11 | Godfrey Chan | 2013-12-06 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | Very tiny typo fix [ci skip] | |||||
| | * | | | | Very tiny typo fix [ci skip] | Robin Dupret | 2013-12-06 | 1 | -1/+1 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #13059 from imkmf/cycle-accepts-array | Rafael Mendonça França | 2013-12-06 | 3 | -1/+26 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cycle object should accept an array Conflicts: actionview/CHANGELOG.md | |||||
| | * | | | | A Cycle object should accept an array and cycle through it as it would | Kristian Freeman | 2013-12-06 | 3 | -1/+24 | |
| | | | | | | | | | | | | | | | | | | | | | with a set of comma-separated objects. | |||||
| * | | | | | Merge pull request #13213 from arunagw/aa-minitest-version-fix | Aaron Patterson | 2013-12-06 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Minitest upgrade broke build | |||||
| | * | | | | | Minitest upgrade broke build | Arun Agrawal | 2013-12-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/seattlerb/minitest/commit/34760e3b268bc1bb4ac5fe1a44ef1ff0a2f9bd4d This PR should fix build | |||||
| * | | | | | | Merge pull request #13214 from JuanitoFatas/master | Godfrey Chan | 2013-12-06 | 1 | -7/+11 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Some improvements on building nested forms. [ci skip] | |||||
| | * | | | | | | Some improvements on building nested forms. [ci skip] | Juanito Fatas | 2013-12-07 | 1 | -7/+11 | |
| | | | | | | | | ||||||
| * | | | | | | | better error message for constants autoloaded from anonymous modules [fixes ↵ | Xavier Noria | 2013-12-06 | 2 | -24/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #13204] load_missing_constant is a private method that basically plays the role of const_missing. This method has an error condition that is surprising: it raises if the class or module already has the missing constant. How is it possible that if the class of module has the constant Ruby has called const_missing in the first place? The answer is that the from_mod argument is self except for anonymous modules, because const_missing passes down Object in such case (see the comment in the source code of the patch for the rationale). But then, it is better to pass down Object *if Object is also missing the constant* and otherwise err with an informative message right away. | |||||
| * | | | | | | | Merge pull request #10635 from vipulnsward/change_to_strict | Jeremy Kemper | 2013-12-06 | 3 | -5/+20 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use `Base.strict_decode64` instead of `Base.decode64` | |||||
| | * | | | | | | | Use `Base.strict_decode64` instead of `Base.decode64` just as we do in encoding; | Vipul A M | 2013-05-16 | 3 | -5/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also reduce extra object allocation by creating string directly instead of join on Array | |||||
| * | | | | | | | | Merge pull request #13216 from arunagw/plugin-gemfile-jruby | Rafael Mendonça França | 2013-12-06 | 2 | -0/+13 | |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Skipping debugger from plugin Gemfile for JRuby | |||||
| | * | | | | | | | Skipping debugger from plugin Gemfile for JRuby | Arun Agrawal | 2013-12-06 | 2 | -0/+13 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #13210 from chancancode/more_enum_docs | Rafael Mendonça França | 2013-12-06 | 1 | -6/+7 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Enum doc fixes | |||||
| | * | | | | | | | _enum_methods_module should be kept private | Godfrey Chan | 2013-12-05 | 1 | -6/+7 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #13212 from arunagw/vcf-mime-type-build-fix | Carlos Antonio da Silva | 2013-12-06 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Fixed test for Mime::VCF | |||||
| | * | | | | | | | Fixed test for Mime::VCF | Arun Agrawal | 2013-12-06 | 1 | -3/+3 | |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | Added here 13dd38cee79be39f7b399e142fd78295dddd2abb | |||||
| * | | | | | | | Merge pull request #13211 from psahni/master | Arun Agrawal | 2013-12-05 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | capitalize words starting after numbered list to maintain consistency [c... | |||||
| | * | | | | | | | capitalize words starting after numbered list to maintain consistency [ci skip] | Prashant Sahni | 2013-12-06 | 1 | -3/+3 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #13198 from chancancode/enum_docs | Godfrey Chan | 2013-12-05 | 1 | -1/+12 | |
| |\| | | | | | | | | | | | | | | | | | | | | Make clear that the enum array should not be changed once defined. [ci skip] | |||||
| | * | | | | | | Make clear that the enum array should not be changed once defined. [ci skip] | Godfrey Chan | 2013-12-05 | 1 | -1/+12 | |
| |/ / / / / / | ||||||
| * | | | | | | Add Mime::Type.register "text/vcard", :vcf to the default list of mime types | David Heinemeier Hansson | 2013-12-05 | 2 | -0/+5 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #12684 from ↵ | Carlos Antonio da Silva | 2013-12-05 | 3 | -0/+21 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mariovisic/fix_kernel_silence_stream_descriptor_leak Fix issue with Kernel#silence_stream leaking file descriptors | |||||
| | * | | | | | | Fix issue with Kernel#silence_stream leaking file descriptors | Mario Visic | 2013-12-06 | 3 | -0/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling Kernel#silence_stream creates a new file descriptor which isn't closed after it is used. As a result calling silence_stream multiple times leads to a build up of loose file descriptors and can cause issues in environments where garbage collection isn't run often. | |||||
| * | | | | | | | Add integration test for #12459 | George Guimarães | 2013-12-05 | 1 | -0/+8 | |
| |/ / / / / / | ||||||
| * | | | | | | fix pg warnings on geometric types | Aaron Patterson | 2013-12-05 | 1 | -10/+23 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #13122 from andrielfn/fix-collection-label-class | Rafael Mendonça França | 2013-12-05 | 5 | -2/+98 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix the merge of a label class defined inside the block | |||||
| | * | | | | | | Label only accepts `:index` and `:namespace` attributes from the input | Andriel Nuernberg | 2013-12-05 | 5 | -2/+98 | |
| |/ / / / / / | ||||||
| * | | | | | | Improve AR changelog [ci skip] | Carlos Antonio da Silva | 2013-12-05 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Use the right type_map | Rafael Mendonça França | 2013-12-05 | 2 | -5/+3 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'av-loading-order' | Rafael Mendonça França | 2013-12-05 | 2 | -5/+19 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Remove the explicit order set for the initializer | Rafael Mendonça França | 2013-12-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will fix the regression added on b068e20b35797aa6deaa377a48c990759734f515. See tests added at ff08d31 to a better understanding about the problem | |||||
| | * | | | | | | Assert the singleton instead of to truthy/falsy | Rafael Mendonça França | 2013-12-05 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will avoid false positives where caching? is nil and should be false | |||||
| | * | | | | | | Add tests to cache_template_loading when an engine loaded Action View | Rafael Mendonça França | 2013-12-05 | 1 | -0/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before the application This test is a regression test to b068e20b35797aa6deaa377a48c990759734f515 that changed the load order of Action View initializers. | |||||
| * | | | | | | | Merge pull request #13199 from arunagw/spring-test-only-development | Rafael Mendonça França | 2013-12-05 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make sure that spring is loaded in development only | |||||
| | * | | | | | | | Make sure that spring is loaded in development only | Arun Agrawal | 2013-12-05 | 1 | -1/+1 | |
| | |/ / / / / / | ||||||
| * / / / / / / | Remove deprecated call to Relation#all | Carlos Antonio da Silva | 2013-12-05 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
| * | | | | | | Using 2.3.11 URL for 2.3.x guides [ci skip] | Arun Agrawal | 2013-12-05 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #13189 from strzalek/retain-ap-av-dep | Jeremy Kemper | 2013-12-05 | 10 | -33/+8 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Retain ActionPack dependency on ActionView. Fixes #12979. | |||||
| | * | | | | | | Remove missing integration points of AV extraction | Carlos Antonio da Silva | 2013-12-05 | 3 | -5/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | Include AV::Layouts directly in AM::Base | Łukasz Strzałkowski | 2013-12-05 | 2 | -6/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to do this in railtie as AM depends on AV either way | |||||
| | * | | | | | | Retain ActionPack dependency on ActionView | Łukasz Strzałkowski | 2013-12-05 | 6 | -22/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #12646 from severin/polymorphic_belongs_to_touch | Yves Senn | 2013-12-05 | 3 | -17/+63 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | polymorphic belongs_to association with touch: true updates old record correctly | |||||
| | * | | | | | | | polymorphic belongs_to association with touch: true updates old record correctly | Severin Schoepke | 2013-12-05 | 3 | -17/+63 | |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: Given you have a comments model with a polymorphic commentable association (e.g. books and songs) with the touch option set. Every time you update a comment its commentable should be touched. This was working when you changed attributes on the comment or when you moved the comment from one book to another. However, it was not working when moving a comment from a book to a song. This is now fixed. | |||||
| * | | | | | | | Merge pull request #13190 from senny/set_enforce_available_locales_first | Carlos Antonio da Silva | 2013-12-05 | 3 | -0/+21 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Set `i18n.enforce_available_locales` before any other configuration option. | |||||
| | * | | | | | | | set `i18n.enforce_available_locales` before `i18n.default_locale`. | Yves Senn | 2013-12-05 | 3 | -0/+21 | |
| |/ / / / / / / | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |