Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Initial implementation of ActiveModel::Serializer | Jose and Yehuda | 2011-10-15 | 3 | -0/+122 |
| | |||||
* | Refactor to make renderers a Set | Jose and Yehuda | 2011-10-15 | 1 | -11/+9 |
| | |||||
* | Initial commit of serializer support | Jose and Yehuda | 2011-10-15 | 5 | -0/+662 |
| | |||||
* | Merge pull request #3320 from sunaku/space-align | José Valim | 2011-10-15 | 1 | -6/+6 |
|\ | | | | | fix inconsistent alignment in Gemfile generator | ||||
| * | fix inconsistent alignment in Gemfile generator | Suraj N. Kurapati | 2011-10-13 | 1 | -6/+6 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-14 | 13 | -89/+206 |
|\ \ | |||||
| * \ | Merge pull request #72 from pote/master | Vijay Dev | 2011-10-14 | 1 | -1/+1 |
| |\ \ | | | | | | | | | small fix | ||||
| | * | | security reasonS should be plural | PoTe | 2011-10-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | [engines guide] WIP for explaining how to hook engine into application | Ryan Bigg | 2011-10-14 | 1 | -0/+46 |
| | | | | |||||
| * | | | [engines guide] complete comments resource generation | Ryan Bigg | 2011-10-14 | 1 | -0/+65 |
| | | | | |||||
| * | | | [engines guide] Add heading for comments | Ryan Bigg | 2011-10-14 | 1 | -0/+1 |
| | | | | |||||
| * | | | [engines guide] make clear that the comment generator command is just one line | Ryan Bigg | 2011-10-14 | 1 | -6/+11 |
| | | | | |||||
| * | | | [engines guide] make it clear that the scaffold generator output isn't part ↵ | Ryan Bigg | 2011-10-14 | 1 | -6/+11 |
| | | | | | | | | | | | | | | | | of the actual command | ||||
| * | | | [engines guide] correct render line is blorgh/comments/form | Ryan Bigg | 2011-10-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | [engines guide] improve wording for sentence describing comments/form partial | Ryan Bigg | 2011-10-14 | 1 | -1/+1 |
| |/ / | |||||
| * | | improved ActiveResource's .element_path and .new_element_path methods ↵ | Diego Carrion | 2011-10-13 | 1 | -0/+8 |
| | | | | | | | | | | | | documentation by specifing how .site should be declared in order to use prefix_options | ||||
| * | | [engines guide] don't show actual timestamp in migration generation | Ryan Bigg | 2011-10-13 | 1 | -1/+1 |
| | | | |||||
| * | | [engines guide] change comments resource generation | Ryan Bigg | 2011-10-13 | 1 | -54/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | Totally didn't like where this section was going, so scrapped it. Scaffold is great for some things (lol) but nested resources is definitely not one of them. Best to walk people through how to do it right, as they would in the real world | ||||
| * | | refactor guide example | Vijay Dev | 2011-10-13 | 1 | -3/+3 |
| | | | |||||
| * | | change activerecord query conditions example to avoid 'type' as column name | Steve Bourne | 2011-10-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | 'Type' is a reserved column for STI. Changed conditions example to avoid using that column name as an example. The example isn't STI-related (and mentioning STI here is needless clutter), so changing to avoid accidentally encouraging users to use 'type' as a column name for other purposes. | ||||
| * | | quoting 'and' to make it more distinct. | Craig Monson | 2011-10-12 | 1 | -1/+1 |
| | | | |||||
| * | | status is a number in Rails 3 | Akira Matsuda | 2011-10-12 | 1 | -2/+2 |
| | | | |||||
| * | | Runtime conditions for associations should use procs | Stephen Pike | 2011-10-11 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | The association guide previously recommended using a trick with single quote delaying of string interpolation in order to handle setting association conditions that would be evaluated at runtime. Using a proc is the new way as this no longer works. | ||||
| * | | Heavy copy editing of the find_each and find_in_batches section | mhutchin | 2011-10-11 | 1 | -26/+34 |
| | | | |||||
| * | | Use .add instead of << to add errors | Evgeniy Dolzhenko | 2011-10-11 | 3 | -6/+6 |
| | | | |||||
| * | | Merge pull request #71 from rahul100885/rahul100885_workspace | Rahul P. Chaudhari | 2011-10-11 | 1 | -2/+2 |
| |\ \ | | | | | | | | | Fixed typos in active_support_core_extensions.textile | ||||
| | * | | Fixed typos in active_support_core_extensions.textile | RAHUL CHAUDHARI | 2011-10-11 | 1 | -2/+2 |
| |/ / | |||||
| * | | Add ActionController#head example | Alexey Vakhov | 2011-10-11 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #3331 from fabrik42/master | José Valim | 2011-10-14 | 3 | -3/+30 |
|\ \ \ | | | | | | | | | Include affected record when raising an ActiveRecord::StaleObjectError | ||||
| * | | | Consider attempted action in exception message of ActiveRecord::StaleObjectError | Christian Bäuerlein | 2011-10-14 | 2 | -6/+7 |
| | | | | |||||
| * | | | Includes stale record in StaleObjectError | Christian Bäuerlein | 2011-10-14 | 3 | -3/+29 |
|/ / / | |||||
* | | | Symbol captures may generate multiple path segments, so don't escape / -> ↵ | Jeremy Kemper | 2011-10-13 | 1 | -7/+17 |
| | | | | | | | | | | | | %2F. Test splat escaping. | ||||
* | | | / is allowed in URI fragments | Jeremy Kemper | 2011-10-13 | 2 | -3/+3 |
| | | | |||||
* | | | Leave escaping up to Journey | Jeremy Kemper | 2011-10-13 | 1 | -4/+3 |
| | | | |||||
* | | | Failing tests for path parameter escaping | Jeremy Kemper | 2011-10-13 | 1 | -0/+27 |
| | | | |||||
* | | | Merge pull request #3314 from macmartine/master | Santiago Pastorino | 2011-10-13 | 2 | -1/+2 |
|\ \ \ | | | | | | | | | Remove user-specified delimiter from start when no area code is present (in number_to_phone) | ||||
| * | | | remove user-specified delimiter from start when no area code is present (in ↵ | Mac Martine | 2011-10-12 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | number_to_phone) | ||||
* | | | | Rails 4 is just around the corner. Stuck with 1.8 until then. | Jeremy Kemper | 2011-10-13 | 1 | -3/+3 |
| | | | | |||||
* | | | | Tests gotta run in 1.8 too | Jeremy Kemper | 2011-10-13 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #2224 from kommen/fix_fragment_caching_for_master | Santiago Pastorino | 2011-10-13 | 0 | -0/+0 |
|\ \ \ \ | | | | | | | | | | | Fix fragment cache helper regression on cache miss introduced with 03d01e | ||||
| * | | | | Fix fragment cache helper regression on cache miss introduced with 03d01ec7. | Dieter Komendera | 2011-07-23 | 3 | -1/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contains following patches cherry-picked from @lhahne's 3-0-stable branch: * Added tests for the output_buffer returned by CacheHelper (c476a6b) The output_buffer returned by CacheHelper should be html_safe if the original buffer is html_safe. * made sure that the possible new output_buffer created by CacheHelper is of the same type as the original (39a4f67) | ||||
* | | | | | Added ActiveRecord::Base.store for declaring simple single-column key/value ↵ | David Heinemeier Hansson | 2011-10-13 | 7 | -1/+93 |
| | | | | | | | | | | | | | | | | | | | | stores [DHH] | ||||
* | | | | | Merge pull request #2219 from kommen/fix_fragment_caching_squashed | Santiago Pastorino | 2011-10-13 | 3 | -1/+51 |
| |_|_|/ |/| | | | | | | | | | | | Fix fragment caching (squashed commits) | ||||
* | | | | Merge pull request #3315 from rahul100885/rahul100885_workspace | José Valim | 2011-10-13 | 1 | -0/+5 |
|\ \ \ \ | |_|/ / |/| | | | Added test to check that the vendor/assets/stylesheets directory is creat | ||||
| * | | | Added test to check that the vendor/assets/stylesheets directory is created | Rahul Chaudhari | 2011-10-13 | 1 | -0/+5 |
|/ / / | |||||
* | | | Merge pull request #3287 from ↵ | José Valim | 2011-10-12 | 2 | -0/+10 |
|\ \ \ | | | | | | | | | | | | | | | | | sgerrand/vendor_assets_javascripts_should_be_created Ensure that the directory 'vendor/assets/javascripts' is created by AppGenerator | ||||
| * | | | Added test to check that the vendor/assets/javascripts directory is created | Sasha Gerrand | 2011-10-11 | 1 | -0/+5 |
| | | | | |||||
| * | | | Added method to create vendor/assets/javascripts, added it to methods called ↵ | Sasha Gerrand | 2011-10-11 | 1 | -0/+5 |
| | |/ | |/| | | | | | | | within vendor method | ||||
* | | | Add some implementation docs. closes #3298. closes #2509. | José Valim | 2011-10-12 | 1 | -0/+4 |
| | | | |||||
* | | | Fix version number in CHANGELOG | Jeremy Kemper | 2011-10-11 | 1 | -1/+1 |
| | | |