Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #3362 from avakhov/p-superfluous-assign-cookies | Vijay Dev | 2011-10-19 | 1 | -1/+1 | |
|\ \ | | | | | | | Remove superfluous assignment in cookies | |||||
| * | | Remove superfluous assignment in cookies | Alexey Vakhov | 2011-10-18 | 1 | -1/+1 | |
| | | | ||||||
* | | | only use now() on pg! | Aaron Patterson | 2011-10-18 | 1 | -1/+3 | |
|/ / | ||||||
* | | reset prepared statement when schema changes imapact statement results. ↵ | Aaron Patterson | 2011-10-18 | 2 | -11/+51 | |
| | | | | | | | | fixes #3335 | |||||
* | | Use again Rack's ContentLength middleware part 2 | Santiago Pastorino | 2011-10-18 | 1 | -0/+1 | |
| | | ||||||
* | | Use again Rack's ContentLength middleware | Santiago Pastorino | 2011-10-18 | 3 | -40/+0 | |
| | | ||||||
* | | Merge pull request #3350 from whilefalse/rake_environment_in_engines | José Valim | 2011-10-18 | 2 | -0/+18 | |
|\ \ | | | | | | | Added environment rake task to engines | |||||
| * | | Added test for rake environment in an engine | steve | 2011-10-18 | 1 | -0/+17 | |
| | | | ||||||
| * | | Added environment rake task to engines | Steven Anderson | 2011-10-18 | 1 | -0/+1 | |
| | | | ||||||
* | | | use now() for dates in pg | Aaron Patterson | 2011-10-18 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #3356 from arunagw/bunp_rack | José Valim | 2011-10-17 | 1 | -1/+1 | |
|\ \ | | | | | | | Bump Rack to 1.3.5 | |||||
| * | | Bump Rack to 1.3.5 | Arun Agrawal | 2011-10-18 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #3340 from surfacedamage/exclude_destroy_in_all_blank_check | José Valim | 2011-10-17 | 3 | -2/+16 | |
|\ \ | | | | | | | Exclude _destroy parameter in :all_blank check (issue #2937) | |||||
| * | | Exclude _destroy parameter in :all_blank check (issue #2937) | Aaron Christy | 2011-10-17 | 3 | -2/+16 | |
| | | | ||||||
* | | | Merge pull request #3151 from zenprogrammer/pluralize_without_count | José Valim | 2011-10-17 | 3 | -7/+30 | |
|\ \ \ | | | | | | | | | Added include_count parameter to pluralize. | |||||
| * | | | Modified String#pluralize to take an optional count parameter. | Ryan Oblak | 2011-09-28 | 3 | -7/+30 | |
| | | | | ||||||
* | | | | use variables from test setup | Vijay Dev | 2011-10-17 | 1 | -6/+4 | |
| | | | | ||||||
* | | | | fix a typo and slightly reword has_secure_password comment | Vijay Dev | 2011-10-17 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Merge pull request #3319 from martinsvalin/active_model_errors_fixes | José Valim | 2011-10-17 | 2 | -4/+29 | |
|\ \ \ \ | | | | | | | | | | | ActiveModel::Errors#generate_message without i18n_scope, and more test cases for #add | |||||
| * | | | | ActiveModel::Errors#generate_message without i18n_scope, and more test cases ↵ | Martin Svalin | 2011-10-17 | 2 | -4/+29 | |
|/ / / / | | | | | | | | | | | | | for #add | |||||
* | | | | Merge pull request #3334 from mperham/master | Aaron Patterson | 2011-10-16 | 3 | -8/+8 | |
|\ \ \ \ | | | | | | | | | | | Default timestamps to non-null | |||||
| * | | | | Default timestamps to non-null | Mike Perham | 2011-10-14 | 3 | -8/+8 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #3343 from vatrai/fix_warning | Vijay Dev | 2011-10-16 | 1 | -2/+2 | |
|\ \ \ \ | |_|_|/ |/| | | | fix to remove warning in test cases | |||||
| * | | | fix to remove warning in test cases | Vishnu Atrai | 2011-10-16 | 1 | -2/+2 | |
|/ / / | ||||||
* | | | 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 |