Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Merge pull request #12203 from chancancode/eager_load_json | Jeremy Kemper | 2013-10-30 | 8 | -227/+242 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Moved all JSON core extensions into core_ext/object/json | Godfrey Chan | 2013-09-13 | 8 | -227/+242 | |
* | | | | | | | :cut: whitespace | Aaron Patterson | 2013-10-30 | 1 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | use a thread local rather than a queue so events are in the right order | Aaron Patterson | 2013-10-30 | 1 | -7/+4 | |
* | | | | | | no need for a CHANGELOG entry. [ci skip]. | Yves Senn | 2013-10-30 | 1 | -7/+1 | |
* | | | | | | fix code typo in `MysqlAdapter` .Closes #12647. | Yves Senn | 2013-10-30 | 3 | -1/+22 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #12702 from dmathieu/finetune_session_fetch | Rafael Mendonça França | 2013-10-30 | 2 | -2/+8 | |
|\ \ \ \ \ | ||||||
| * | | | | | session#fetch doesn't behave exactly like Hash#fetch. | Damien Mathieu | 2013-10-30 | 2 | -2/+8 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #12687 from notalex/master | Yves Senn | 2013-10-30 | 1 | -7/+12 | |
|\ \ \ \ \ | ||||||
| * | | | | | Update pull request instructions as per the new Github UI | Alex Johnson | 2013-10-30 | 1 | -7/+12 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #12653 from releu/short_arrays_in_inspect | Yves Senn | 2013-10-30 | 3 | -3/+19 | |
|\ \ \ \ \ | ||||||
| * | | | | | short arrays in inspect | Jan Bernacki | 2013-10-30 | 3 | -3/+19 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #12692 from dmathieu/session_fetch | Guillermo Iguaran | 2013-10-29 | 3 | -0/+37 | |
|\ \ \ \ \ | ||||||
| * | | | | | add the fetch method to sessions | Damien Mathieu | 2013-10-29 | 3 | -0/+37 | |
* | | | | | | Merge pull request #12693 from carpodaster/convert-cdata-input-to-string | Rafael Mendonça França | 2013-10-29 | 2 | -1/+5 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Convert CDATA input to string before gsub'ing | Carsten Zimmermann | 2013-10-29 | 2 | -1/+5 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #12690 from durrantm/minor_README_change | Yves Senn | 2013-10-29 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Clarify that visiting http://localhost:3000 should be done in a browser. | Michael Durrant | 2013-10-29 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #12688 from simi/patch-1 | Rafael Mendonça França | 2013-10-29 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Update testing.rake with more accurate description of test task. | Josef Šimánek | 2013-10-29 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Revert "add active model basics wip to guides/documents.yaml" | Xavier Noria | 2013-10-29 | 1 | -6/+0 | |
* | | | | | Merge pull request #10664 from aderyabin/docpatch | Yves Senn | 2013-10-29 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix doc in Postgres database creation | Andrey Deryabin | 2013-06-25 | 1 | -1/+1 | |
* | | | | | | Fix broken delete_all test, which will now be failing since #delete_all is br... | David Heinemeier Hansson | 2013-10-28 | 1 | -4/+4 | |
* | | | | | | Add failing test for preloading with a polymorphic association and using the ... | David Heinemeier Hansson | 2013-10-28 | 1 | -1/+10 | |
* | | | | | | Remove confusing generated-code commentary | Jeremy Kemper | 2013-10-28 | 1 | -4/+4 | |
* | | | | | | fix template Gemfiles | Aaron Patterson | 2013-10-28 | 3 | -12/+25 | |
* | | | | | | always call set_default_accessors from create_root | Aaron Patterson | 2013-10-28 | 1 | -0/+1 | |
* | | | | | | Merge pull request #11785 from grosser/grosser/file-unless-exist | Rafael Mendonça França | 2013-10-28 | 3 | -0/+12 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | support :unless_exist for FileCache | grosser | 2013-08-30 | 3 | -0/+12 | |
* | | | | | | | use a queue rather than a list. fixes #12069 | Aaron Patterson | 2013-10-28 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #11564 from zzak/active_model_guide | Yves Senn | 2013-10-28 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | add active model basics wip to guides/documents.yaml | Zachary Scott | 2013-07-22 | 1 | -0/+6 | |
* | | | | | | | | fix typo in comment [ci skip]. | Yves Senn | 2013-10-28 | 1 | -1/+1 | |
* | | | | | | | | Fix typo | David Heinemeier Hansson | 2013-10-27 | 1 | -1/+1 | |
* | | | | | | | | Fix indentation [ci skip] | Carlos Antonio da Silva | 2013-10-27 | 1 | -2/+2 | |
* | | | | | | | | Merge pull request #12578 from jeradphelps/configurable_schema_migrations_tab... | Rafael Mendonça França | 2013-10-27 | 5 | -3/+24 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | added schema_migrations_table_name to ActiveRecord::Base in order that the na... | Jerad Phelps | 2013-10-27 | 5 | -3/+24 | |
* | | | | | | | | | Merge pull request #12668 from arunagw/aa-improvments | Rafael Mendonça França | 2013-10-27 | 2 | -7/+18 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fixed tests for app_generator | Arun Agrawal | 2013-10-27 | 2 | -7/+18 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Remove warning of shadowing outer local variable | Rafael Mendonça França | 2013-10-27 | 1 | -2/+2 | |
* | | | | | | | | | Assert the return value in the test | Rafael Mendonça França | 2013-10-27 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #12664 from jetthoughts/12242_includes_in_through_association | Rafael Mendonça França | 2013-10-27 | 4 | -2/+37 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Skip `include_values` from through associations chains for building target scope | Paul Nikitochkin | 2013-10-27 | 4 | -2/+37 | |
* | | | | | | | | | | Remove dead code after the skip_jbuilder option removal | Rafael Mendonça França | 2013-10-27 | 1 | -1/+0 | |
* | | | | | | | | | | remove the skip_jbuilder option, just rm it from the Gemfile | Aaron Patterson | 2013-10-27 | 1 | -3/+0 | |
* | | | | | | | | | | add comments and fix variable name. oops, forgot to add this. orz! | Aaron Patterson | 2013-10-27 | 1 | -2/+2 | |
* | | | | | | | | | | remove unused methods | Aaron Patterson | 2013-10-27 | 1 | -4/+0 | |
* | | | | | | | | | | Merge remote-tracking branch 'origin/master' | Aaron Patterson | 2013-10-27 | 5 | -12/+21 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #12657 from robin850/skip-javascript | Guillermo Iguaran | 2013-10-27 | 5 | -14/+21 | |
| |\ \ \ \ \ \ \ \ \ \ |