aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Added failing test for json_escape striping quotation marksGodfrey Chan2013-12-041-0/+45
* Merge pull request #13171 from kuldeepaggarwal/test-case-updationRafael Mendonça França2013-12-041-1/+0
|\
| * removed duplicate test caseKuldeep Aggarwal2013-12-041-1/+0
* | Merge pull request #13170 from acapilleri/remove_return_nilRafael Mendonça França2013-12-041-3/+1
|\ \ | |/ |/|
| * remove nil in NullType#ref.Angelo capilleri2013-12-041-3/+1
* | mention Active Record enums as major feature for 4.1. [ci skip]Yves Senn2013-12-041-0/+23
|/
* Merge pull request #13167 from fluxusfrequency/patch-3Carlos Antonio da Silva2013-12-041-13/+17
|\
| * Formatting, capitalization, and punctuation fixes [ci skip]Ben Lewis2013-12-041-13/+17
|/
* Merge pull request #13152 from mariovisic/text_helper_missing_raw_methodCarlos Antonio da Silva2013-12-042-0/+7
|\
| * Fix issue where TextHelper#simple_format was calling missing 'raw' methodMario Visic2013-12-052-0/+7
* | Merge pull request #12403 from thedarkone/attr-method-missing-fixRafael Mendonça França2013-12-042-3/+51
|\ \ | |/ |/|
| * Fix AR#method_missing re-dispatching into overwritten attribute methods.thedarkone2013-09-292-3/+51
* | Fix documentation of number_to_currency helperRafael Mendonça França2013-12-041-4/+4
* | remove variants paragraph indent in release notes. [ci skip]Yves Senn2013-12-041-23/+24
* | add Spring as major feature in the 4.1 release notes. [ci skip]Yves Senn2013-12-042-0/+57
* | Merge pull request #12958 from jonleighton/springJon Leighton2013-12-045-7/+71
|\ \
| * | Install Spring preloader when generating new applicationsJon Leighton2013-12-035-7/+71
* | | minor 4_1_release_notes changes. [ci skip]Yves Senn2013-12-041-22/+11
* | | Merge pull request #13109 from chancancode/json_guidesJeremy Kemper2013-12-033-0/+93
|\ \ \
| * | | Added JSON release notes [ci skip]Godfrey Chan2013-12-032-0/+89
| * | | Backfilled CHANGELOG for AS::JSON::Variable removal (6f3e01e8) [ci skip]Godfrey Chan2013-12-031-0/+4
* | | | Improve a couple exception messages related to variants and mime typesCarlos Antonio da Silva2013-12-033-15/+19
* | | | Add nodoc to added VariantFilter classCarlos Antonio da Silva2013-12-031-3/+3
|/ / /
* | | Merge pull request #12977 from strzalek/action-pack-variantsJeremy Kemper2013-12-0316-18/+227
|\ \ \
| * | | Add variants to release notesŁukasz Strzałkowski2013-12-041-0/+33
| * | | Action Pack VariantsŁukasz Strzałkowski2013-12-0415-18/+194
|/ / /
* / / optimize string literals in erb templatesAaron Patterson2013-12-031-2/+2
|/ /
* | Remove earlier return in favor of conditionalCarlos Antonio da Silva2013-12-031-6/+9
* | Change delimiter check order: first check if it is presentCarlos Antonio da Silva2013-12-031-3/+3
* | Make both conversion methods work similarlyCarlos Antonio da Silva2013-12-031-1/+2
* | Remove useless empty stringCarlos Antonio da Silva2013-12-031-2/+1
* | No need for #tapCarlos Antonio da Silva2013-12-031-4/+3
* | Avoid a hash creation since defaults is a new hash alreadyCarlos Antonio da Silva2013-12-031-1/+1
* | Stop using local variables everywhere, make use of the readerCarlos Antonio da Silva2013-12-036-20/+20
* | Refactor to avoid earlier returnsCarlos Antonio da Silva2013-12-031-5/+9
* | Rename variable that holds whether or not the class should validate a float n...Carlos Antonio da Silva2013-12-035-9/+9
* | Change deep_munge call to avoid deprecation warningCarlos Antonio da Silva2013-12-031-2/+2
* | Improve AR changelog, add entry for migration error improvements #12462 [ci s...Carlos Antonio da Silva2013-12-031-2/+12
* | Merge pull request #12462 from jjb/improve_ar_exception_message_formattingCarlos Antonio da Silva2013-12-031-8/+15
|\ \
| * | ActiveRecord migration exception message formattingJohn Joseph Bachir2013-12-031-8/+15
* | | Merge pull request #13149 from laurocaetano/fix_offset_lastCarlos Antonio da Silva2013-12-033-1/+16
|\ \ \
| * | | Fix offset with last.Lauro Caetano2013-12-033-1/+16
| |/ /
* | | Remove the escaping skipRafael Mendonça França2013-12-031-1/+1
* | | Merge branch 'master-sec'Aaron Patterson2013-12-038-18/+38
|\ \ \ | |/ / |/| |
| * | Deep Munge the parameters for GET and POSTMichael Koziarski2013-12-022-2/+17
| * | Stop using i18n's built in HTML error handling.Michael Koziarski2013-12-022-14/+10
| * | Ensure simple_format escapes its html attributesMichael Koziarski2013-12-021-1/+1
| * | Escape the unit value provided to number_to_currencyMichael Koziarski2013-12-022-1/+3
| * | Only use valid mime type symbols as cache keysAaron Patterson2013-12-021-0/+7
* | | `connection.type_to_sql` returns a `String` for unmapped types.Yves Senn2013-12-033-1/+16