aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | 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
* | | | | Changelog improvements [ci skip]Carlos Antonio da Silva2013-12-032-6/+6
* | | | | Merge pull request #9685 from dimko/patch-2Carlos Antonio da Silva2013-12-034-21/+42
|\ \ \ \ \
| * | | | | Added Date#all_week/month/quarter/year for generating date rangesDimko2013-12-034-21/+42
|/ / / / /
* | | | | Merge pull request #12822 from cbartlett/masterCarlos Antonio da Silva2013-12-033-4/+43
|\ \ \ \ \
| * | | | | Add support for localized date referencesColin Bartlett2013-12-033-0/+39
| * | | | | Use travel_to convention in existing testColin Bartlett2013-12-031-4/+4
* | | | | | Merge pull request #13145 from acapilleri/fix_email_exampleCarlos Antonio da Silva2013-12-031-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix email regex example code [ci skip]Angelo capilleri2013-12-031-1/+1
* | | | | | Merge pull request #13143 from joker1007/fix_active_record_callbacks_document...Rafael Mendonça França2013-12-031-2/+2
|\ \ \ \ \ \
| * | | | | | Fix ActiveRecord::Callbacks sample code [ci skip]joker10072013-12-031-2/+2
|/ / / / / /
* | | | | | Fix bad usage of #select with hashCarlos Antonio da Silva2013-12-031-1/+1
* | | | | | Merge pull request #11643 from vipulnsward/query_cache_clearCarlos Antonio da Silva2013-12-033-1/+15
|\ \ \ \ \ \
| * | | | | | Currently, we clear query_cache in cache block finish, even if we may already...Vipul A M2013-12-033-1/+15
|/ / / / / /
* | | | | | Merge pull request #13022 from pwnall/fixture_contextYves Senn2013-12-036-1/+116
|\ \ \ \ \ \
| * | | | | | Introduce a context for rendering fixtures ERB.Victor Costan2013-12-036-1/+116
|/ / / / / /
* | | | | | Convert Mime::NullType in a singletonGuillermo Iguaran2013-12-031-1/+4
* | | | | | Cleanups in comment about conditionalGuillermo Iguaran2013-12-031-1/+2
* | | | | | Merge branch 'format_localized_template' of https://github.com/acapilleri/railsGuillermo Iguaran2013-12-034-1/+22
|\ \ \ \ \ \
| * | | | | | Fix header Content-Type: #<Mime::NullType:...> in localized templateAngelo capilleri2013-12-034-1/+22
| |/ / / / /
* | | | | | Tidy up previous commit, fix message assertion and improve testsCarlos Antonio da Silva2013-12-032-2/+9
* | | | | | Modify the Hash#assert_valid_keys error message so that it shows the valid ke...Nerian2013-12-033-4/+9
* | | | | | Merge pull request #13060 from chancancode/change_log_for_json_refactorCarlos Antonio da Silva2013-12-023-0/+59
|\ \ \ \ \ \
| * | | | | | Added back the `encode_big_decimal_as_string` option with warningGodfrey Chan2013-12-023-0/+59
* | | | | | | Avoid generating more strings while iterating to create methodsCarlos Antonio da Silva2013-12-021-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge remote-tracking branch 'origin/master'Rafael Mendonça França2013-12-0218-21/+41
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #12123 from aredondo/masterCarlos Antonio da Silva2013-12-021-0/+8
| |\ \ \ \ \ \
| | * | | | | | Add regression test for IpSpoofAttackError issueAlvaro Redondo2013-09-031-0/+8
| * | | | | | | Remove note about removed local_constant_names method from guides [ci skip]Carlos Antonio da Silva2013-12-021-1/+1
| * | | | | | | Remove dead comment from AS extensions guide [ci skip]Carlos Antonio da Silva2013-12-021-2/+0
| * | | | | | | Fix note about class attribute accessors deprecated file [ci skip]Carlos Antonio da Silva2013-12-021-1/+1
| * | | | | | | Merge pull request #13138 from gsamokovarov/remove-cattr-requiresGuillermo Iguaran2013-12-0215-15/+15
| |\ \ \ \ \ \ \
| | * | | | | | | Remove deprecated cattr_* requiresGenadi Samokovarov2013-12-0315-15/+15
| * | | | | | | | Add number and range field to form helpers articleJuanito Fatas2013-12-021-2/+16
* | | | | | | | | :sicssors:Rafael Mendonça França2013-12-028-15/+2
* | | | | | | | | Options are not optionalRafael Mendonça França2013-12-021-2/+2
* | | | | | | | | Make execute priave APIRafael Mendonça França2013-12-027-12/+16