aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | 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
| * | | | Add missing requireRafael Mendonça França2013-12-041-0/+1
| * | | | Rename verifier to message_verifierRafael Mendonça França2013-12-043-10/+10
| * | | | Add documentation and CHANGELOG entry to Application#verifierRafael Mendonça França2013-12-042-0/+21
| * | | | Add application verifierRafael Mendonça França2013-12-042-0/+53
|/ / / /
* | | | make the type_map per connection. fixes #13182Aaron Patterson2013-12-042-12/+17
* | | | Merge pull request #13183 from sorah/never_ignore_i18n_translate_raise_optionCarlos Antonio da Silva2013-12-043-1/+22
|\ \ \ \
| * | | | Escalate missing error when :raise is trueShota Fukumori (sora_h)2013-12-053-1/+22
|/ / / /
* | | | Run Travis tests using Ruby 2.1.0-preview2 tooSantiago Pastorino2013-12-041-0/+2
* | | | Update changelog [ci skip]Rafael Mendonça França2013-12-041-2/+2
* | | | Update guides welcome page to point to version 3.2.16 [ci skip]Arun Agrawal2013-12-041-2/+2
* | | | Merge pull request #13177 from kuldeepaggarwal/doc-upgradeRafael Mendonça França2013-12-041-2/+2
|\ \ \ \
| * | | | update guides to new version of rails 3.2.x[ci skip]Kuldeep Aggarwal2013-12-051-2/+2
* | | | | Review json_escape docs [ci skip]Carlos Antonio da Silva2013-12-041-22/+22
|/ / / /
* | | | Merge pull request #13073 from chancancode/json_escapeJeremy Kemper2013-12-043-14/+107
|\ \ \ \
| * | | | Also move html_esacpe regex to a constant (see 9d25af60)Godfrey Chan2013-12-041-1/+2
| * | | | Added \u2028 \u2029 to json_escapeGodfrey Chan2013-12-043-6/+12
| * | | | Use lower case letters in unicodes sequences to match the new encoder's outputGodfrey Chan2013-12-042-4/+4
| * | | | Fixed a long-standing bug in `json_escape` that strips quotation marksGodfrey Chan2013-12-042-12/+53