aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Simplify @responses hash initializationŁukasz Strzałkowski2013-12-101-1/+2
* Revert "Merge pull request #13235 from strzalek/variants-inline" -- needs a l...David Heinemeier Hansson2013-12-082-28/+10
* Merge pull request #13235 from strzalek/variants-inlineDavid Heinemeier Hansson2013-12-082-10/+28
|\
| * Inline variants syntaxŁukasz Strzałkowski2013-12-082-9/+27
| * Simplify @responses hash initializationŁukasz Strzałkowski2013-12-081-1/+1
* | Merge pull request #13231 from chancancode/upgrade_minitestGuillermo Iguaran2013-12-081-1/+1
|\ \
| * | Upgrade minitest versionGodfrey Chan2013-12-081-1/+1
| |/
* | Merge pull request #13232 from strzalek/av-missing-requiresRafael Mendonça França2013-12-082-0/+2
|\ \ | |/ |/|
| * 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 con...David Heinemeier Hansson2013-12-073-2/+5
* 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 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]Robin Dupret2013-12-061-1/+1
|/
* Merge pull request #13059 from imkmf/cycle-accepts-arrayRafael Mendonça França2013-12-063-1/+26
|\
| * A Cycle object should accept an array and cycle through it as it wouldKristian Freeman2013-12-063-1/+24
* | Merge pull request #13213 from arunagw/aa-minitest-version-fixAaron Patterson2013-12-061-1/+1
|\ \
| * | Minitest upgrade broke buildArun Agrawal2013-12-061-1/+1
* | | Merge pull request #13214 from JuanitoFatas/masterGodfrey Chan2013-12-061-7/+11
|\ \ \
| * | | 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
* | | | Merge pull request #10635 from vipulnsward/change_to_strictJeremy Kemper2013-12-063-5/+20
|\ \ \ \
| * | | | Use `Base.strict_decode64` instead of `Base.decode64` just as we do in encoding;Vipul A M2013-05-163-5/+20
* | | | | Merge pull request #13216 from arunagw/plugin-gemfile-jrubyRafael Mendonça França2013-12-062-0/+13
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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_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::VCFArun Agrawal2013-12-061-3/+3
|/ / / /
* | | | Merge pull request #13211 from psahni/masterArun Agrawal2013-12-051-3/+3
|\ \ \ \
| * | | | 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]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 mariovisic/fix_kernel_silence_stream_descripto...Carlos Antonio da Silva2013-12-053-0/+21
|\ \ \
| * | | Fix issue with Kernel#silence_stream leaking file descriptorsMario Visic2013-12-063-0/+21
* | | | 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
|\ \ \
| * | | 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
| * | | Assert the singleton instead of to truthy/falsyRafael Mendonça França2013-12-051-4/+4
| * | | Add tests to cache_template_loading when an engine loaded Action ViewRafael Mendonça França2013-12-051-0/+14
* | | | 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 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-11-17 15:31:11 +0000