Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 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. |