aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* syntax error joining/including modelsSergio2013-11-181-2/+2
| | | syntax error joining/including models
* syntax error joining tablesSergio2013-11-181-5/+5
| | | syntax error joining tables
* The option is called encode_big_decimal_as_string [ci-skip]Godfrey Chan2013-11-151-1/+1
|
* Update action_controller_overview.md [ci skip]Harshad Sabne2013-11-151-1/+1
| | | Code style adherence
* Fix broken Wikipedia link.Harshad Sabne2013-11-131-1/+1
|
* Remove outdated guide on using rack builder w/o rails middlewareAlex Johnson2013-11-131-20/+0
| | | | [ci skip]
* Correct guide relating MiddlewareStackProxy with EnumerableAlex Johnson2013-11-131-5/+4
| | | | | | | | [ci skip] Enumerable.instance_methods & Rails::Configuration::MiddlewareStackProxy.instance_methods # => [:as_json] MiddlewareStackProxy does not share any notable methods with Enumerable.
* [ci skip] Replace #=> with # =>Alex Johnson2013-11-123-17/+17
|
* Fix RailsServer#start content in initialization guideAlex Johnson2013-11-121-17/+23
| | | | [ci skip]
* Change syntax format for example returned valuesPrem Sichanugrist2013-11-1119-107/+107
| | | | | | | | | According to our guideline, we leave 1 space between `#` and `=>`, so we want `# =>` instead of `#=>`. Thanks to @fxn for the suggestion. [ci skip]
* Add section for command_tasks in initialization guideAlex Johnson2013-11-081-12/+42
| | | | [ci skip]
* Update commands.rb content in initialization guideAlex Johnson2013-11-081-2/+8
| | | | [ci skip]
* Update README.rdoc [ci skip]Harshad Sabne2013-11-081-1/+1
| | | Highlighted code
* 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
| | | | | | | | refs #11561 #12700
| * 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
| | | | | | see here 4d4ff531b8807ee88a3fc46875c7e76f613956fb
| * Hstore and JSON fields are not supported with storeRobin Dupret2013-10-301-0/+4
| | | | | | | | | | The use of `store` on Hstore fields (for instance) is not needed because serialization aimed to interact with Ruby objects and not with provided field types
| * 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
| | | | | | | | See rails/rails#12608
| * 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
| | | | | | | | See #8328
| * Update 4_0_release_notes.mdHarshad Sabne2013-10-221-2/+2
| | | | | | Code Highlighted
| * Fixes typoJay Hayes2013-10-201-1/+1
| |
| * Update 3_2_release_notes.mdHarshad Sabne2013-10-201-1/+1
| | | | | | Code style adherence
| * 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 seconds
| * | 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
|\ \ | | | | | | Extract method refactoring for Rails::Server#start
| * | 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 docs [ci skip]
| * | | Fix AS::TimeWithZone#as_json docsBogdan Gusiev2013-11-071-4/+4
| | | | | | | | | | | | | | | | According to 28ab79d7c579fa1d76ac868be02b38b02818428a
* | | | 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.
| * | | | Move the JSON extension require statements to the right place.Godfrey Chan2013-11-062-8/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | In #12203, the JSON core extensions were moved into the `core_ext` folder. Unfortunately, there are some corresponding requires that were left behind. The problem is partially addressed in #12710, this commit fixes the rest.
* | | | 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)
| * | | | Do not expose internal state in the public encoder API (i.e. as_json)Godfrey Chan2013-11-064-55/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See [1] for why this is not a good idea. As part of this refactor, circular reference protection in as_json has been removed and the corresponding error class has been deprecated. As discussed with @jeremy, circular reference error is considered programmer errors and protecting against it is out of scope for the encoder. This is again based on the excellent work by @sergiocampama in #11728. [1]: https://github.com/intridea/multi_json/pull/138#issuecomment-24468223
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saved about 46 array allocations per request on an extremely simple application. The delegation happened in the notification subsystem which is a hotspot, so this should result in even more savings with larger apps. Squashed commit of the following: commit 41eef0d1479526f7de25fd4391d98e61c126d9f5 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Nov 6 16:32:31 2013 -0800 speed up notifications commit 586b4a18656f66fb2c518fb8e8fee66a016e8ae6 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Nov 6 16:31:05 2013 -0800 speed up runtime registry methods commit b67d074cb4314df9a88438f785868cef77e583d7 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Nov 6 16:28:12 2013 -0800 change method name and make it public
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | constant. `view_assigns` can use the precalculated sets and remove instance variables without allocating any extra arrays
* | | | 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
| | | |