Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | No need to use a begin block there | Daniel Schierbeck | 2011-09-04 | 1 | -5/+3 |
| | |||||
* | Merge docrails, resolving conflicts in the assets guide | Vijay Dev | 2011-09-04 | 9 | -24/+26 |
|\ | |||||
| * | minor fixes in assets guide | Vijay Dev | 2011-09-04 | 1 | -11/+9 |
| | | |||||
| * | Merge pull request #64 from rinaldifonseca/master | Guillermo Iguaran | 2011-09-03 | 1 | -1/+1 |
| |\ | | | | | | | Added |t| to create_table block | ||||
| | * | Added |t| to create_table block | Rinaldi Fonseca | 2011-09-04 | 1 | -1/+1 |
| |/ | |||||
| * | add some missing dots in the docs | Vijay Dev | 2011-09-04 | 1 | -4/+4 |
| | | |||||
| * | Fix asset_path example in CSS and ERB section | Guillermo Iguaran | 2011-09-02 | 1 | -1/+1 |
| | | |||||
| * | document send_file guesses content type from the file extension | Vijay Dev | 2011-09-03 | 1 | -1/+3 |
| | | | | | | | | and remove info about x_send_file option to send_file | ||||
| * | fix YUI description | Richard Hulse | 2011-09-03 | 1 | -1/+1 |
| | | | | | | | | | | YUI CSS compressor does not extend syntax! Also added link to more info | ||||
| * | Fixed a typo in the section about migration. | David Peckham | 2011-09-02 | 1 | -1/+1 |
| | | |||||
| * | some of the changes for validation earlier reverted from d20281a | Vijay Dev | 2011-09-03 | 3 | -4/+6 |
| | | |||||
| * | Change photos_path to photos_url in Using redirect_to | Franco Catena | 2011-09-02 | 1 | -1/+1 |
| | | | | | | | | Is more "correct" a complete url than only the path | ||||
* | | Merge pull request #2848 from arunagw/jruby_activesupport_fix | Jon Leighton | 2011-09-04 | 1 | -4/+6 |
|\ \ | | | | | | | Need to have a check here for JAVA PLATFORM for JRuby | ||||
| * | | We can't simply check the first line of the backtrace, | Arun Agrawal | 2011-09-04 | 1 | -4/+6 |
| | | | | | | | | | because JRuby reports the call to __send__ in the backtrace. | ||||
* | | | Revert "Fixes bug in ActiveRecord::QueryMethods, #1697" | Jon Leighton | 2011-09-04 | 2 | -7/+4 |
| | | | | | | | | | | | | | | | | | | This reverts commit 0df27c98d982ec87d2fb48cfda82694eb267993e. Reverted due to failing test, see #2845. | ||||
* | | | Merge pull request #2841 from wojtekmach/app-generators-group | José Valim | 2011-09-04 | 4 | -1/+61 |
|\ \ \ | | | | | | | | | Add gem group support to generators | ||||
| * | | | Add gem_group support to generators | Wojciech Mach | 2011-09-04 | 4 | -1/+61 |
| | | | | |||||
* | | | | Merge pull request #2816 from sikachu/content_tag_for | José Valim | 2011-09-04 | 4 | -7/+166 |
|\ \ \ \ | |_|/ / |/| | | | Make `content_tag_for` and `div_for` accepts the array of records | ||||
| * | | | Make `content_tag_for` and `div_for` accepts the array of records | Prem Sichanugrist | 2011-09-04 | 4 | -7/+166 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So instead of having to do this: @items.each do |item| content_tag_for(:li, item) do Title: <%= item.title %> end end You can now do this: content_tag_for(:li, @items) do |item| Title: <%= item.title %> end | ||||
* | | | | Remove useless parens | Santiago Pastorino | 2011-09-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #2844 from arunagw/warnings_removed_master | Santiago Pastorino | 2011-09-03 | 12 | -37/+37 |
|\ \ \ \ | | | | | | | | | | | Warnings removed from master | ||||
| * | | | | Modified content in guides and comments | Arun Agrawal | 2011-09-04 | 4 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for "assert /" warnings. Removed because if somebody will use this code they will get warnings! | ||||
| * | | | | Warnings removed for "assert_match /" Please do | Arun Agrawal | 2011-09-04 | 6 | -25/+25 |
| | | | | | | | | | | | | | | | | | | | | not add more.! | ||||
| * | | | | Warnings removed for using shadow variable. | Arun Agrawal | 2011-09-04 | 2 | -4/+4 |
|/ / / / | |||||
* | | | | restores the API docs of AR::Fixtures, made a quick pass over them, revises ↵ | Xavier Noria | 2011-09-03 | 3 | -370/+363 |
| | | | | | | | | | | | | | | | | link in fixture template [closes #2840] | ||||
* | | | | Merge pull request #2835 from guilleiguaran/actionpack-changelog | Santiago Pastorino | 2011-09-03 | 1 | -2/+2 |
| |/ / |/| | | | | | | | | Include ticket numbers in AP CHANGELOG | ||||
* | | | Merge pull request #2836 from avakhov/action-controller-helpers-desc | Vijay Dev | 2011-09-03 | 1 | -3/+6 |
|\ \ \ | | | | | | | | | fix helpers behavior description | ||||
| * | | | fix helpers behavior description | Alexey Vakhov | 2011-09-03 | 1 | -3/+6 |
| |/ / | |||||
* | | | Merge pull request #2825 from guilleiguaran/bcrypt-ruby-comments | Aaron Patterson | 2011-09-03 | 2 | -0/+9 |
|\ \ \ | | | | | | | | | Add comments about bcrypt-ruby gem to SecurePassword and add it to default Gemfile | ||||
| * | | | Add comments about bcrypt-ruby gem to SecurePassword | Guillermo Iguaran | 2011-09-03 | 1 | -0/+6 |
| | | | | |||||
| * | | | Add bcrypt-ruby to Gemfile template | Guillermo Iguaran | 2011-09-03 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge pull request #2824 from arunagw/bcrypt_fix | Aaron Patterson | 2011-09-03 | 1 | -0/+1 |
|\ \ \ \ | |_|/ / |/| | | | Need to add here to pass the test | ||||
| * | | | Need to add here to pass the test | Arun Agrawal | 2011-09-03 | 1 | -0/+1 |
| |/ / | | | | | | | As in previous commit it's removed. | ||||
* | | | Merge pull request #2827 from sikachu/extractable_ordered_hash | José Valim | 2011-09-03 | 3 | -0/+12 |
|\ \ \ | |/ / |/| | | Make `ActiveSupport::OrderedHash` extractable when using `Array#extract_options! | ||||
| * | | Make `ActiveSupport::OrderedHash` extractable when using ↵ | Prem Sichanugrist | 2011-09-03 | 3 | -0/+12 |
| | | | | | | | | | | | | | | | `Array#extract_options!` `ActiveSupport::OrderedHash` is actually a subclass of the hash, so it does make sense that it should be extractable from the array list. | ||||
* | | | fixes CSS example in the asset pipeline guide | Xavier Noria | 2011-09-03 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-02 | 12 | -83/+174 |
|\ \ | |||||
| * | | Revert "Fixing guides validation errors." | Vijay Dev | 2011-09-02 | 10 | -24/+18 |
| | | | | | | | | | | | | | | | | | | This reverts commit d20281add192e5afba66e555ce67cf73943b033b. Reason: This needs more investigation. Will apply when this is verified. | ||||
| * | | debug option to js, stylesheet tags are ignored when debug mode is off | Vijay Dev | 2011-09-02 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'fix_validation_errors' | Andrew Olson | 2011-09-02 | 10 | -17/+23 |
| |\ \ | |||||
| | * | | Fixing guides validation errors. | Andrew Olson | 2011-09-02 | 10 | -18/+24 |
| | | | | |||||
| * | | | When a collection is empty, render returns nil. | Matt Burke | 2011-09-02 | 1 | -0/+7 |
| | | | | |||||
| * | | | Merge branch 'activemodel_typo_fix' | Josh Nesbitt | 2011-09-02 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Fix typo in ActiveModel::Dirty comment. define_attribute_methods is a class ↵ | Josh Nesbitt | 2011-09-02 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | method, not attribute. | ||||
| * | | | Change the styling of '<ruby>initialize</ruby>' to '+initialize+' (the ↵ | Stephen J. Butler | 2011-09-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | former breaks the HTML generation). | ||||
| * | | | fix some minor omissions in pipeline docs | Richard Hulse | 2011-09-02 | 1 | -5/+18 |
| | | | | |||||
| * | | | Add #update_attributes as another alternative to #update_column. | Sebastian Martinez | 2011-09-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #63 from carlosparamio/master | Vijay Dev | 2011-09-01 | 1 | -6/+6 |
| |\ \ \ | | | | | | | | | | | Fix name of parent resource params when declaring nested resources at routes | ||||
| | * | | | Fix name of parent resource params when declaring nested resources at routes | Carlos Paramio | 2011-09-01 | 1 | -6/+6 |
| |/ / / | |||||
| * | | | Revert "Fix logic in 3.1 release notes sentence" | Vijay Dev | 2011-09-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 30d65da17e5fb1cdd3f10a6d14f4295b57e26286. Reason: This commit is incorrect. It is indeed recommended to use update_attribute when you want callbacks to be invoked. |