Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | 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 | |||||
| * | | [engines guide] reword first two dot points in prologue | Ryan Bigg | 2011-10-10 | 1 | -2/+2 | |
| | | | ||||||
| * | | [engines guide] Credit where credit is due + explaning directory structure | Ryan Bigg | 2011-10-10 | 1 | -3/+40 | |
| | | | ||||||
| * | | [engines guide] Credit where credit is due | Ryan Bigg | 2011-10-10 | 1 | -0/+2 | |
| | | | ||||||
| * | | Copy editing to improve readability, consistency, and tone | mhutchin | 2011-10-09 | 1 | -4/+4 | |
| | | | ||||||
| * | | Minor copy editing | mhutchin | 2011-10-09 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge pull request #70 from mcdd/master | Guillermo Iguaran | 2011-10-09 | 1 | -2/+2 | |
| |\ \ | | | | | | | | | Update security guide ActiveRecordStore/SessionStore | |||||
| | * | | ActiveRecordStore is now called SessionStore. | Dan McDonald | 2011-10-09 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Copy editing: s/Rails guesses/Rails assumes/g | mhutchin | 2011-10-09 | 1 | -7/+7 | |
| |/ / | ||||||
* | | | Merge pull request #3274 from arunagw/warning_removed_mysql2 | Vijay Dev | 2011-10-10 | 1 | -2/+2 | |
|\ \ \ | | | | | | | | | ambiguous first argument; put parentheses or even spaces Warning removed! | |||||
| * | | | ambiguous first argument; put parentheses or even spaces Warning removed! | Arun Agrawal | 2011-10-10 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Merge pull request #3265 from arunagw/warning_uri_parser | Vijay Dev | 2011-10-10 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | URI.escape is obsolete : warning removed | |||||
| * | | | | URI.escape is obsolete : warning removed | Arun Agrawal | 2011-10-09 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #3275 from simi/patch-1 | José Valim | 2011-10-10 | 1 | -7/+8 | |
|\ \ \ \ \ | | | | | | | | | | | | | Improve ActiveRecord changelog | |||||
| * | | | | | Active Record changelog mistakes | Josef Šimánek | 2011-10-10 | 1 | -7/+8 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #3272 from odorcicd/fix_json_error_root | José Valim | 2011-10-10 | 2 | -1/+35 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | JSON responder should return errors with :errors root | |||||
| * | | | | JSON responder should return errors with :error root | Denis Odorcic | 2011-10-10 | 2 | -1/+35 | |
|/ / / / | ||||||
* | | | | Use broken YAML that will fail with Syck as well as Psych. Fixes ↵ | Jon Leighton | 2011-10-09 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | test_broken_yaml_exception in fixtures_test.rb on Ruby 1.8.7. Cherry-pick from 3-1-stable: b8d46924e70e0847e92e1d2dbaaec8c11381072c | |||||
* | | | | Remove stray whitespace | Jeremy Kemper | 2011-10-09 | 1 | -4/+1 | |
| | | | | ||||||
* | | | | Only use LOWER for mysql case insensitive uniqueness check when column has a ↵ | Joseph Palermo | 2011-10-09 | 10 | -12/+139 | |
| | | | | | | | | | | | | | | | | case sensitive collation. | |||||
* | | | | Merge pull request #3270 from kennyj/fix_invalid_regex | Santiago Pastorino | 2011-10-09 | 1 | -1/+1 | |
|\ \ \ \ | |_|/ / |/| | | | (small patch) fix invalid regex in testcase | |||||
| * | | | fix invalid regex | kennyj | 2011-10-10 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-09 | 5 | -18/+84 | |
|\ \ \ | ||||||
| * | | | Corrections to the ajax guide recent changes. This guide is very | Vijay Dev | 2011-10-09 | 1 | -32/+26 | |
| | | | | | | | | | | | | | | | | outdated and will need a lot of changes to make it useful for Rails 3+ | |||||
| * | | | Fix a typo that was mysteriously entered in previous commit | Roy Tomeij | 2011-10-09 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Add note about how Sass & Sprockets don't match | Roy Tomeij | 2011-10-09 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | Copy editing to improve readability and remove any potential ambiguity | mhutchin | 2011-10-09 | 1 | -8/+8 | |
| | | | | ||||||
| * | | | improving the docs for ajax_on_rails | Karunakar (Ruby) | 2011-10-09 | 1 | -13/+22 | |
| | | | | ||||||
| * | | | copy editing | mhutchin | 2011-10-08 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | copy editing | mhutchin | 2011-10-08 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Revert "Revert "updated the ajax_on_rails.textile for rails3" because of ↵ | Karunakar (Ruby) | 2011-10-09 | 1 | -4/+65 | |
| | | | | | | | | | | | | | | | | | | | | | | | | invalid git user" This reverts commit 5d2ffbb992b4ab875a121761fc0cf14dcaa12033. | |||||
| * | | | copy editing | mhutchin | 2011-10-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | "updated the ajax_on_rails.textile for rails3" | |||||
| * | | | Correct stylesheet filename and remove reference to old stylesheet ↵ | mhutchin | 2011-10-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | compilation location | |||||
| * | | | Fix params hash example in AC::Base comment | Alexey Vakhov | 2011-10-08 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #3266 from arunagw/warnings_removed | Santiago Pastorino | 2011-10-09 | 3 | -3/+3 | |
|\ \ \ \ | |_|/ / |/| | | | Warnings removed when running with 1.9.3 |