Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | 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 | |
| | | | | ||||||
* | | | | Treat 303 See Other as a redirect response, too | Jeremy Kemper | 2011-10-11 | 4 | -6/+29 | |
| | | | | ||||||
* | | | | Merge remote-tracking branch 'jimherz/activeresource_redirection_patch' | Jeremy Kemper | 2011-10-11 | 3 | -3/+12 | |
|\ \ \ \ | | | | | | | | | | | | | | | | Closes #3302 | |||||
| * | | | | activeresource should treat HTTP status 307 as redirection, same as 301 and ↵ | Jim Herzberg | 2011-10-11 | 3 | -3/+12 | |
|/ / / / | | | | | | | | | | | | | 302; added missing test cases for statii 301 and 302. | |||||
* | | | | Merge pull request #3295 from zhengjia/master | José Valim | 2011-10-11 | 2 | -1/+9 | |
|\ \ \ \ | | | | | | | | | | | Fix multiple includes with options | |||||
| * | | | | Fixed serialization issues with multiple includes with options | zhengjia | 2011-10-11 | 2 | -1/+9 | |
|/ / / / | ||||||
* | | | | Merge pull request #3289 from avakhov/p-respond_to-conditions | José Valim | 2011-10-11 | 2 | -4/+4 | |
|\ \ \ \ | | | | | | | | | | | Support symbol and string actions in AC#respond_to options | |||||
| * | | | | Support symbol and string actions in AC#respond_to options | Alexey Vakhov | 2011-10-11 | 2 | -4/+4 | |
|/ / / / | ||||||
* | | | | Merge pull request #3285 from dcrec1/master | José Valim | 2011-10-10 | 2 | -3/+14 | |
|\ \ \ \ | | | | | | | | | | | Fixes #3280: Shorthand route nested in scope produces missing controller error | |||||
| * | | | | allow shorthand routes with nested optional parameters | Diego Carrion | 2011-10-10 | 2 | -3/+14 | |
| |/ / / | ||||||
* | | | | Merge pull request #3286 from rahul100885/rahul100885_workspace | Vijay Dev | 2011-10-10 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | Corrected typo | |||||
| * | | | Corrected typo | RAHUL CHAUDHARI | 2011-10-11 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-10 | 4 | -26/+245 | |
|\ \ \ | ||||||
| * | | | [engines guide] add TODO for RedCarpet example | Ryan Bigg | 2011-10-10 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | [engines guide] cover generating the comment resource | Ryan Bigg | 2011-10-10 | 1 | -2/+84 | |
| | | | | ||||||
| * | | | Fix rails/generators/base.rb documentation for generator lookup | Ryan Bigg | 2011-10-10 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | [engines guide] amend two TODOs for further things in this guide | Ryan Bigg | 2011-10-10 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | [engines guide] finish covering what the scaffold generator does within an ↵ | Ryan Bigg | 2011-10-10 | 1 | -2/+42 | |
| | | | | | | | | | | | | | | | | engine | |||||
| * | | | [engines guide] final line change | Ryan Bigg | 2011-10-10 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | [engines guide] Add TODO for mentioning rails s and rails c | Ryan Bigg | 2011-10-10 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | [engines guide] begin explaining what the scaffold generator outputs within ↵ | Ryan Bigg | 2011-10-10 | 1 | -2/+56 | |
| | | | | | | | | | | | | | | | | an engine |