Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove more skip | Rafael Mendonça França | 2013-11-08 | 4 | -13/+7 |
| | |||||
* | Don't skip tests if we don't need to. | Rafael Mendonça França | 2013-11-08 | 30 | -1023/+966 |
| | | | | | | | We can conditional define the tests depending on the adapter or connection. Lets keep the skip for fail tests that need to be fixed. | ||||
* | removes redundant curly brackets in example code [ci skip] | Xavier Noria | 2013-11-08 | 1 | -1/+1 |
| | |||||
* | Merge pull request #12609 from corwinkelly/patch-1 | Xavier Noria | 2013-11-08 | 1 | -3/+1 |
|\ | | | | | Update workaround for "Outside the Scope of Strong Parameters" | ||||
| * | Fix undefined method error for NilClass | corwinkelly | 2013-10-23 | 1 | -1/+1 |
| | | | | | | Add .try to prevent undefined method error for NilClass. | ||||
| * | Update workaround for "Outside the Scope of Strong Parameters" | corwinkelly | 2013-10-22 | 1 | -3/+1 |
| | | | | | | The previous example of how to permit a hash of unknown keys used .tap, but had the side effect of logging an "Unpermitted parameters" message despite being a successful workaround. The proposed workaround is ever so slightly better, imo, because it won't result in an "Unpermitted parameters" message being logged. | ||||
* | | Merge pull request #12803 from arunagw/remove-unused-require | Rafael Mendonça França | 2013-11-08 | 1 | -2/+0 |
|\ \ | | | | | | | Removed unused require | ||||
| * | | Removed unused require | Arun Agrawal | 2013-11-08 | 1 | -2/+0 |
| | | | |||||
* | | | Merge pull request #12292 from bf4/better_database_yaml | Xavier Noria | 2013-11-08 | 11 | -145/+85 |
|\ \ \ | |/ / |/| | | Extract common database defaults; better use of YAML | ||||
| * | | Extract common database defaults; better use of YAML | Benjamin Fleischer | 2013-11-08 | 11 | -145/+85 |
|/ / | |||||
* | | Merge pull request #12791 from jasonayre/ja/fix_autoload_error | Rafael Mendonça França | 2013-11-07 | 2 | -0/+6 |
|\ \ | | | | | | | add autoload :TransactionState to fix Marshal.load issues | ||||
| * | | revised changelog comment to be less than 80 chars | Jason Ayre | 2013-11-07 | 1 | -2/+2 |
| | | | |||||
| * | | add autoload :TransactionState to fix Marshal.load issues | Jason Ayre | 2013-11-07 | 2 | -0/+6 |
| | | | |||||
* | | | Merge pull request #12795 from arunagw/plateform-dependent-gems | Rafael Mendonça França | 2013-11-07 | 2 | -0/+16 |
|\ \ \ | | | | | | | | | Added platform dependent gems | ||||
| * | | | Added platform dependent gems | Arun Agrawal | 2013-11-07 | 2 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | See #12475 If people are on rbx they will get the desired gem | ||||
* | | | | Merge pull request #12800 from raysrashmi/warning-removed-ruby-trunk | Rafael Mendonça França | 2013-11-07 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Warning removed for ruby-head | ||||
| * | | | Warning removed for ruby-head | Rashmi Yadav | 2013-11-07 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #12799 from arunagw/aa-av-test-fixes | Jeremy Kemper | 2013-11-07 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Don't call sub! since it may return nil. Reverts 4d15661. | ||||
| * | | | sub! can return nil | Arun Agrawal | 2013-11-07 | 1 | -1/+1 |
|/ / / | | | | | | | | | | | | | | | | Revert "drop one more string allocation" This reverts commit 4d15661d6c46c86a62ee1fc358f4b3ef9dd9f2ea. | ||||
* | | | Merge pull request #12798 from arunagw/plugin-generators-test | Guillermo Iguaran | 2013-11-07 | 1 | -1/+4 |
|\ \ \ | | | | | | | | | Fixed plugin_generator test | ||||
| * | | | Fixed plugin_generator test | Arun Agrawal | 2013-11-07 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Template replay needs to happen after bundle. As we are doing TemplateRecording in apply_rails_template. here are few commits for changes 8beb42cfbc41753ae4dbb91e16abcd1fb7d00356 9104702be61253f9448ca070a22fc86bb4299555 | ||||
* | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-11-07 | 10 | -37/+83 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Update Rails initialization guide to explain how bin/rails is executed | Alex Johnson | 2013-11-06 | 1 | -3/+36 |
| | | | | |||||
| * | | | refine usage docs of `store` in combination with `hstore` and `json`. | Yves Senn | 2013-11-06 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | refs #11561 #12700 | ||||
| * | | | Fixed code syntax for config.ru [ci skip] | Rashmi Yadav | 2013-11-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | exists? is deprecated in ruby trunk [ci skip] | Rashmi Yadav | 2013-11-01 | 2 | -4/+4 |
| | | | | | | | | | | | | see here 4d4ff531b8807ee88a3fc46875c7e76f613956fb | ||||
| * | | | Hstore and JSON fields are not supported with store | Robin Dupret | 2013-10-30 | 1 | -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_ section | Zachary Scott | 2013-10-28 | 1 | -23/+23 |
| | | | | |||||
| * | | | fix typo introduced when searching in markdown document with vim | Damien Mathieu | 2013-10-24 | 1 | -14/+14 |
| | | | | |||||
| * | | | rephrase the overriding views part about the view path | Damien Mathieu | 2013-10-24 | 1 | -15/+15 |
| | | | | | | | | | | | | | | | | See rails/rails#12608 | ||||
| * | | | Fixed URL link to rendered_component plugin [ci skip] | Harshad Sabne | 2013-10-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | warning about saving models with dirty attributes | Damien Mathieu | 2013-10-23 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | See #8328 | ||||
| * | | | Update 4_0_release_notes.md | Harshad Sabne | 2013-10-22 | 1 | -2/+2 |
| | | | | | | | | | | | | Code Highlighted | ||||
| * | | | Fixes typo | Jay Hayes | 2013-10-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update 3_2_release_notes.md | Harshad Sabne | 2013-10-20 | 1 | -1/+1 |
| | | | | | | | | | | | | Code style adherence | ||||
| * | | | Update I18n guide to note the additional features of the `translate` view helper | Jay Hayes | 2013-10-19 | 1 | -1/+7 |
| | | | | |||||
| * | | | Updated 3.2.x link [ci skip] | Rashmi Yadav | 2013-10-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #12228 from ersatzryan/standardize-json-time-formats | Andrew White | 2013-11-07 | 5 | -7/+12 |
|\ \ \ \ | |_|/ / |/| | | | Standardize all JSON encoded times to use 3 decimal fractional seconds | ||||
| * | | | Standardize all JSON encoded times to use 3 decimal fractional seconds | Ryan Glover | 2013-11-07 | 5 | -7/+12 |
|/ / / | |||||
* | | | Aesthetics | Rafael Mendonça França | 2013-11-07 | 1 | -13/+13 |
| | | | |||||
* | | | Merge pull request #12787 from notalex/extract_method | Rafael Mendonça França | 2013-11-07 | 1 | -23/+34 |
|\ \ \ | | | | | | | | | Extract method refactoring for Rails::Server#start | ||||
| * | | | Move interrupt information to print_boot_information method | Alex Johnson | 2013-11-07 | 1 | -4/+1 |
| | | | | |||||
| * | | | Extract method refactoring for Rails::Server#start | Alex Johnson | 2013-11-07 | 1 | -24/+38 |
| | | | | |||||
* | | | | Merge pull request #12771 from bogdan/patch-1 | Yves Senn | 2013-11-07 | 1 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Fix AS::TimeWithZone#as_json docs [ci skip] | ||||
| * | | | | Fix AS::TimeWithZone#as_json docs | Bogdan Gusiev | 2013-11-07 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | According to 28ab79d7c579fa1d76ac868be02b38b02818428a | ||||
* | | | | | only ask for these ivars if the target responds to them | Aaron Patterson | 2013-11-06 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Merge pull request #12792 from chancancode/move_json_requires | Rafael Mendonça França | 2013-11-06 | 2 | -8/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Move the JSON extension require statements to the right place. | ||||
| * | | | | | Move the JSON extension require statements to the right place. | Godfrey Chan | 2013-11-06 | 2 | -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_state | Jeremy Kemper | 2013-11-06 | 5 | -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 Chan | 2013-11-06 | 4 | -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 |