aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #13219 from robin850/patch-11Godfrey Chan2013-12-061-1/+1
|\ \ | | | | | | Very tiny typo fix [ci skip]
| * | Very tiny typo fix [ci skip]Robin Dupret2013-12-061-1/+1
|/ /
* | Merge pull request #13059 from imkmf/cycle-accepts-arrayRafael Mendonça França2013-12-063-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 wouldKristian Freeman2013-12-063-1/+24
| | | | | | | | | | | | with a set of comma-separated objects.
* | | Merge pull request #13213 from arunagw/aa-minitest-version-fixAaron Patterson2013-12-061-1/+1
|\ \ \ | | | | | | | | Minitest upgrade broke build
| * | | Minitest upgrade broke buildArun Agrawal2013-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | https://github.com/seattlerb/minitest/commit/34760e3b268bc1bb4ac5fe1a44ef1ff0a2f9bd4d This PR should fix build
* | | | Merge pull request #13214 from JuanitoFatas/masterGodfrey Chan2013-12-061-7/+11
|\ \ \ \ | | | | | | | | | | Some improvements on building nested forms. [ci skip]
| * | | | Some improvements on building nested forms. [ci skip]Juanito Fatas2013-12-071-7/+11
| | | | |
* | | | | better error message for constants autoloaded from anonymous modules [fixes ↵Xavier Noria2013-12-062-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_strictJeremy Kemper2013-12-063-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 M2013-05-163-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | Also reduce extra object allocation by creating string directly instead of join on Array
* | | | | | Merge pull request #13216 from arunagw/plugin-gemfile-jrubyRafael Mendonça França2013-12-062-0/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Skipping debugger from plugin Gemfile for JRuby
| * | | | | Skipping debugger from plugin Gemfile for JRubyArun Agrawal2013-12-062-0/+13
|/ / / / /
* | | | | Merge pull request #13210 from chancancode/more_enum_docsRafael Mendonça França2013-12-061-6/+7
|\ \ \ \ \ | | | | | | | | | | | | Enum doc fixes
| * | | | | _enum_methods_module should be kept privateGodfrey Chan2013-12-051-6/+7
| | | | | |
* | | | | | Merge pull request #13212 from arunagw/vcf-mime-type-build-fixCarlos Antonio da Silva2013-12-061-3/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fixed test for Mime::VCF
| * | | | | Fixed test for Mime::VCFArun Agrawal2013-12-061-3/+3
|/ / / / / | | | | | | | | | | | | | | | Added here 13dd38cee79be39f7b399e142fd78295dddd2abb
* | | | | Merge pull request #13211 from psahni/masterArun Agrawal2013-12-051-3/+3
|\ \ \ \ \ | | | | | | | | | | | | capitalize words starting after numbered list to maintain consistency [c...
| * | | | | capitalize words starting after numbered list to maintain consistency [ci skip]Prashant Sahni2013-12-061-3/+3
|/ / / / /
* | | | | Merge pull request #13198 from chancancode/enum_docsGodfrey Chan2013-12-051-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 Chan2013-12-051-1/+12
|/ / / /
* | | | Add Mime::Type.register "text/vcard", :vcf to the default list of mime typesDavid Heinemeier Hansson2013-12-052-0/+5
| | | |
* | | | Merge pull request #12684 from ↵Carlos Antonio da Silva2013-12-053-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 descriptorsMario Visic2013-12-063-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 #12459George Guimarães2013-12-051-0/+8
|/ / / /
* | | | fix pg warnings on geometric typesAaron Patterson2013-12-051-10/+23
| | | |
* | | | Merge pull request #13122 from andrielfn/fix-collection-label-classRafael Mendonça França2013-12-055-2/+98
|\ \ \ \ | | | | | | | | | | Fix the merge of a label class defined inside the block
| * | | | Label only accepts `:index` and `:namespace` attributes from the inputAndriel Nuernberg2013-12-055-2/+98
|/ / / /
* | | | Improve AR changelog [ci skip]Carlos Antonio da Silva2013-12-051-1/+1
| | | |
* | | | Use the right type_mapRafael Mendonça França2013-12-052-5/+3
| | | |
* | | | Merge branch 'av-loading-order'Rafael Mendonça França2013-12-052-5/+19
|\ \ \ \
| * | | | Remove the explicit order set for the initializerRafael Mendonça França2013-12-051-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/falsyRafael Mendonça França2013-12-051-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 ViewRafael Mendonça França2013-12-051-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-developmentRafael Mendonça França2013-12-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Make sure that spring is loaded in development only
| * | | | | Make sure that spring is loaded in development onlyArun Agrawal2013-12-051-1/+1
| |/ / / /
* / / / / Remove deprecated call to Relation#allCarlos Antonio da Silva2013-12-051-1/+1
|/ / / /
* | | | Using 2.3.11 URL for 2.3.x guides [ci skip]Arun Agrawal2013-12-051-1/+1
| | | |
* | | | Merge pull request #13189 from strzalek/retain-ap-av-depJeremy Kemper2013-12-0510-33/+8
|\ \ \ \ | | | | | | | | | | Retain ActionPack dependency on ActionView. Fixes #12979.
| * | | | Remove missing integration points of AV extractionCarlos Antonio da Silva2013-12-053-5/+1
| | | | |
| * | | | Include AV::Layouts directly in AM::BaseŁukasz Strzałkowski2013-12-052-6/+2
| | | | | | | | | | | | | | | | | | | | No need to do this in railtie as AM depends on AV either way
| * | | | Retain ActionPack dependency on ActionViewŁukasz Strzałkowski2013-12-056-22/+5
| | | | |
* | | | | Merge pull request #12646 from severin/polymorphic_belongs_to_touchYves Senn2013-12-053-17/+63
|\ \ \ \ \ | | | | | | | | | | | | polymorphic belongs_to association with touch: true updates old record correctly
| * | | | | polymorphic belongs_to association with touch: true updates old record correctlySeverin Schoepke2013-12-053-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_firstCarlos Antonio da Silva2013-12-053-0/+21
|\ \ \ \ \ | | | | | | | | | | | | Set `i18n.enforce_available_locales` before any other configuration option.
| * | | | | set `i18n.enforce_available_locales` before `i18n.default_locale`.Yves Senn2013-12-053-0/+21
|/ / / / /
* | | | | add missing CHANGELOG entry for d8c6f52. [ci skip]Yves Senn2013-12-052-0/+8
| | | | | | | | | | | | | | | | | | | | Discoverd by #13175.
* | | | | end sentences with a `.`. [ci skip]Yves Senn2013-12-053-12/+14
| | | | |
* | | | | Merge pull request #13185 from Jashank/patch-1Jeremy Kemper2013-12-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | docs: Replace an unpleasant grammatical construct.
| * | | | | Rails on Rack: Replace an unpleasant grammatical construct.Jashank Jeremy2013-12-051-1/+1
|/ / / / / | | | | | | | | | | [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 21:46:37 +0000