aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Remove `DEFAULT NULL` for primary key column to support MySQL 5.7.3Yasuo Honda2013-12-103-7/+7
|/ / / | | | | | | | | | Since MySQL 5.7.3 m13 does now allow primary key column is null.
* | | Revert "Merge pull request #13235 from strzalek/variants-inline" -- needs a ↵David Heinemeier Hansson2013-12-082-28/+10
| | | | | | | | | | | | | | | | | | | | | little more work! This reverts commit 186161148a189839a1e0924043f068a8d155ce69, reversing changes made to cad9eb178ea5eec0e27d74e93518f4ed34e2f997.
* | | Merge pull request #13235 from strzalek/variants-inlineDavid Heinemeier Hansson2013-12-082-10/+28
|\ \ \ | |/ / |/| | Inline syntax for variants
| * | Inline variants syntaxŁukasz Strzałkowski2013-12-082-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In most cases, when setting variant specific code, you're not sharing any code within format. Inline syntax can vastly simplify defining variants in those sitiations: respond_to do |format| format.js { render "trash" } format.html do |variant| variant.phone { redirect_to progress_path } variant.none { render "trash" } end end ` Becomes: respond_to do |format| format.js { render "trash" } format.html.phone { redirect_to progress_path } format.html.none { render "trash" } end
| * | Simplify @responses hash initializationŁukasz Strzałkowski2013-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @responses hash needs to be initialized with mime types that we get from Collector#collect_mimes_from_class_level. Mime::Type class as key and nil as value. This need to happen before content negotiation. Before that, it was looping though mime types and executing mime-type-generated method inside collector (see AbstractController::Collector#generate_method_for_mime). That approach resulted in 2 unnecessary method calls for each mime type collected by Collector#collect_mimes_from_class_level. Now hash is initialized in place, without usage of Collector#custom method.
* | | Merge pull request #13231 from chancancode/upgrade_minitestGuillermo Iguaran2013-12-081-1/+1
|\ \ \ | | | | | | | | Upgrade minitest version
| * | | Upgrade minitest versionGodfrey Chan2013-12-081-1/+1
| |/ / | | | | | | | | | | | | We made a change in #13213 that depends on a new file that's only in minitest 5.1.0+, so the version should be updated.
* | | Merge pull request #13232 from strzalek/av-missing-requiresRafael Mendonça França2013-12-082-0/+2
|\ \ \ | |/ / |/| | Require action_view explicitly in AC::Base
| * | Require action_view explicitly in AC::BaseŁukasz Strzałkowski2013-12-082-0/+2
|/ /
* | Variants can be declared without a block to signify their presence in the ↵David Heinemeier Hansson2013-12-073-2/+5
| | | | | | | | controller
* | Allow code execution in case no variant has been set with variant.noneDavid Heinemeier Hansson2013-12-072-4/+21
| |
* | Merge pull request #13221 from stereoscott/patch-1Godfrey Chan2013-12-061-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 M2013-12-071-1/+1
|/ /
* | 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
|/ / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 04:53:57 +0000