aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12798 from arunagw/plugin-generators-testGuillermo Iguaran2013-11-071-1/+4
|\
| * Fixed plugin_generator testArun Agrawal2013-11-071-1/+4
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-11-0710-37/+83
|\ \ | |/ |/|
| * Update Rails initialization guide to explain how bin/rails is executedAlex Johnson2013-11-061-3/+36
| * refine usage docs of `store` in combination with `hstore` and `json`.Yves Senn2013-11-061-3/+3
| * Fixed code syntax for config.ru [ci skip]Rashmi Yadav2013-11-041-1/+1
| * exists? is deprecated in ruby trunk [ci skip]Rashmi Yadav2013-11-012-4/+4
| * Hstore and JSON fields are not supported with storeRobin Dupret2013-10-301-0/+4
| * guides/rails_on_rack: Fix formatting of _Internal Middleware Stack_ sectionZachary Scott2013-10-281-23/+23
| * fix typo introduced when searching in markdown document with vimDamien Mathieu2013-10-241-14/+14
| * rephrase the overriding views part about the view pathDamien Mathieu2013-10-241-15/+15
| * Fixed URL link to rendered_component plugin [ci skip]Harshad Sabne2013-10-231-1/+1
| * warning about saving models with dirty attributesDamien Mathieu2013-10-231-0/+3
| * Update 4_0_release_notes.mdHarshad Sabne2013-10-221-2/+2
| * Fixes typoJay Hayes2013-10-201-1/+1
| * Update 3_2_release_notes.mdHarshad Sabne2013-10-201-1/+1
| * Update I18n guide to note the additional features of the `translate` view helperJay Hayes2013-10-191-1/+7
| * Updated 3.2.x link [ci skip]Rashmi Yadav2013-10-181-1/+1
* | Merge pull request #12228 from ersatzryan/standardize-json-time-formatsAndrew White2013-11-075-7/+12
|\ \
| * | Standardize all JSON encoded times to use 3 decimal fractional secondsRyan Glover2013-11-075-7/+12
|/ /
* | AestheticsRafael Mendonça França2013-11-071-13/+13
* | Merge pull request #12787 from notalex/extract_methodRafael Mendonça França2013-11-071-23/+34
|\ \
| * | Move interrupt information to print_boot_information methodAlex Johnson2013-11-071-4/+1
| * | Extract method refactoring for Rails::Server#startAlex Johnson2013-11-071-24/+38
* | | Merge pull request #12771 from bogdan/patch-1Yves Senn2013-11-071-4/+4
|\ \ \
| * | | Fix AS::TimeWithZone#as_json docsBogdan Gusiev2013-11-071-4/+4
* | | | only ask for these ivars if the target responds to themAaron Patterson2013-11-061-3/+3
* | | | Merge pull request #12792 from chancancode/move_json_requiresRafael Mendonça França2013-11-062-8/+7
|\ \ \ \
| * | | | Move the JSON extension require statements to the right place.Godfrey Chan2013-11-062-8/+7
|/ / / /
* | | | Merge pull request #12785 from chancancode/do_not_leak_internal_stateJeremy Kemper2013-11-065-58/+45
|\ \ \ \
| * | | | Do not expose internal state in the public encoder API (i.e. as_json)Godfrey Chan2013-11-064-55/+42
| * | | | Moved AS::JSON::DATE_REGEX as it's only used for decodingGodfrey Chan2013-11-062-3/+3
|/ / / /
* | | | Stop using method missing for singleton delegation.Aaron Patterson2013-11-065-9/+15
* | | | drop one more string allocationAaron Patterson2013-11-061-1/+1
* | | | drop string allocations in the log subscriberAaron Patterson2013-11-061-2/+12
* | | | calculate the ivars to remove in advance as a set and cache them in aAaron Patterson2013-11-063-12/+17
* | | | use a set and reject to avoid array allocationsAaron Patterson2013-11-061-4/+11
* | | | each_with_object on the view_assigns hashAaron Patterson2013-11-061-3/+1
* | | | use slice to avoid range allocationAaron Patterson2013-11-061-1/+3
* | | | these variables are also privateAaron Patterson2013-11-061-0/+1
* | | | instance_variables returns symbols, so we should use symbols in our listAaron Patterson2013-11-061-1/+1
| |/ / |/| |
* | | Merge pull request #12789 from claudiob/humanize-without-capitalizingXavier Noria2013-11-067-15/+58
|\ \ \
| * | | Add +capitalize+ option to Inflector.humanizeclaudiob2013-11-067-15/+58
|/ / /
* | | Merge pull request #12788 from kylefritz/patch-1Rafael Mendonça França2013-11-061-2/+2
* | | Merge pull request #12783 from chancancode/eliminate_direct_json_gem_useJeremy Kemper2013-11-068-31/+32
|\ \ \
| * | | Eliminate `JSON.{parse,load,generate,dump}` and `def to_json`Godfrey Chan2013-11-058-31/+32
* | | | bring back constant to expose the enum mapping as HWIA.Yves Senn2013-11-062-4/+19
* | | | update the AR enum docs to match the actual behavior. [ci skip]Yves Senn2013-11-061-5/+3
|/ / /
* | | Fix AS changelog indent, remove tabs and extra spaces [ci skip]Carlos Antonio da Silva2013-11-061-2/+2
* | | Merge pull request #12782 from chancancode/fix_object_and_struct_as_jsonJeremy Kemper2013-11-053-5/+40
|\ \ \