aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* 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
|\
| * 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
| * 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 correctlySeverin Schoepke2013-12-053-17/+63
|/ /
* | Merge pull request #13190 from senny/set_enforce_available_locales_firstCarlos Antonio da Silva2013-12-053-0/+21
|\ \
| * | 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
* | 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
|\ \
| * | Rails on Rack: Replace an unpleasant grammatical construct.Jashank Jeremy2013-12-051-1/+1
|/ /
* | 2.1.0 is fineRafael Mendonça França2013-12-051-1/+0
* | Use the released arel gemRafael Mendonça França2013-12-052-2/+1
* | Merge pull request #12995 from rails/application-verifierRafael Mendonça França2013-12-044-6/+97
|\ \
| * | Hightlight message verifier in the release notes [ci skip]Rafael Mendonça França2013-12-041-0/+11
| * | Make salt argument required for message verifierRafael Mendonça França2013-12-043-13/+13
| * | Fix typosRafael Mendonça França2013-12-042-3/+3
| * | Test if two different verifiers don't share the same secretRafael Mendonça França2013-12-041-2/+12
| * | Update the releases notesRafael Mendonça França2013-12-041-0/+1
| * | Don't need to use a controller to test the verifierRafael Mendonça França2013-12-041-9/+3
| * | No need to configure saltsRafael Mendonça França2013-12-043-34/+7
| * | Make possibile to get different message verifiersRafael Mendonça França2013-12-043-10/+37