| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #5182 from castlerock/content_tag_instead_string | Xavier Noria | 2012-04-05 | 1 | -2/+2 |
|\ |
|
| * | content_tag used instead string for option | Vishnu Atrai | 2012-02-26 | 1 | -2/+2 |
* | | Merge pull request #5750 from ahoward/master | Aaron Patterson | 2012-04-05 | 1 | -2/+13 |
|\ \ |
|
| * | | url_for: avoid a nil check. unroll a loop. handle most common case 1st. | ara.t.howard | 2012-04-05 | 1 | -18/+13 |
| * | | carefully and quickly merge url_for options | ara.t.howard | 2012-04-04 | 1 | -1/+17 |
* | | | Merge pull request #5707 from morgoth/remove-unnecessary-block-in-fetch | Xavier Noria | 2012-04-05 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | removed unnecessary block when using fetch | Wojciech Wnętrzak | 2012-04-02 | 1 | -1/+1 |
* | | | | Merge pull request #4446 from ayamomiji/patch-1 | José Valim | 2012-04-05 | 1 | -1/+1 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | prevent the cache sweeper ignores NoMethodError | ayaya | 2012-03-29 | 1 | -1/+1 |
* | | | | Merge pull request #5716 from jurriaan/tr-gsub-cleanup | Santiago Pastorino | 2012-04-04 | 6 | -8/+8 |
|\ \ \ \ |
|
| * | | | | Updated/changed useless tr/gsubs | Jurriaan Pruis | 2012-04-03 | 6 | -8/+8 |
| | |/ /
| |/| | |
|
* | | | | No need to extend ActiveSupport::Extend here | Oscar Del Ben | 2012-04-04 | 1 | -2/+0 |
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-04 | 2 | -3/+3 |
|\ \ \ \ |
|
| * | | | | Fix AC responder example | Alexey Vakhov | 2012-04-04 | 1 | -1/+1 |
| * | | | | Remove non-obligatory params in AC respond_to examples | Alexey Vakhov | 2012-04-03 | 1 | -2/+2 |
* | | | | | minor elsif/else typo fix | Tieg Zaharia | 2012-04-03 | 1 | -1/+1 |
| |/ / /
|/| | | |
|
* | | | | add type option to atom feed entry builder | Sergey Nartimov | 2012-04-01 | 1 | -1/+4 |
* | | | | Merge pull request #5694 from hardipe/master | Santiago Pastorino | 2012-04-01 | 1 | -4/+0 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Useless/Confusing method definition removed | hardi | 2012-04-01 | 1 | -4/+0 |
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-01 | 3 | -3/+2 |
|\ \ \ \ |
|
| * | | | | :success includes the whole 200 range, not just 200. | Erich Menge | 2012-04-01 | 1 | -1/+1 |
| * | | | | CSRF messages are no longer controlled by 422.html because InvalidAuthenticit... | Tony Primerano | 2012-03-28 | 1 | -1/+0 |
| * | | | | Fix quotes at select_tag examples | Anderson Dias | 2012-03-28 | 1 | -1/+1 |
* | | | | | Small #label method refactoring, thanks @rafaelfranca | Alexey Vakhov | 2012-04-01 | 1 | -3/+2 |
* | | | | | Block version of label should wrapped in field_with_errors in case of error | Alexey Vakhov | 2012-04-01 | 1 | -1/+2 |
| |/ / /
|/| | | |
|
* | | | | Remove not needed requires | Santiago Pastorino | 2012-03-31 | 1 | -1/+0 |
* | | | | Merge pull request #5664 from lest/patch-1 | Piotr Sarnacki | 2012-03-31 | 1 | -2/+2 |
|\ \ \ \ |
|
| * | | | | use `symbolize_keys` instead of `dup.symbolize_keys!` | Sergey Nartimov | 2012-03-30 | 1 | -2/+2 |
* | | | | | Remove obsolete reader from AC::MethodNotAllowed exception class | Alexey Vakhov | 2012-03-31 | 1 | -2/+0 |
* | | | | | Remove AC::RenderError class second declaration | Alexey Vakhov | 2012-03-31 | 1 | -3/+0 |
* | | | | | Remove the leading \n added by textarea on assert_select | Santiago Pastorino | 2012-03-30 | 1 | -0/+1 |
|/ / / / |
|
* | | | | Merge pull request #5625 from nertzy/prefix_partial_path_with_controller_name... | José Valim | 2012-03-28 | 2 | -3/+16 |
|\ \ \ \ |
|
| * | | | | Make controller namespace partial prefix optional | Grant Hutchins | 2012-03-28 | 2 | -3/+16 |
| | |/ /
| |/| | |
|
* | | | | Merge pull request #5359 from avakhov/missed-commits-from-3-2-stable | Santiago Pastorino | 2012-03-28 | 2 | -1/+2 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | datetime_select should work with -/+ infinity dates | Joe Van Dyk | 2012-03-28 | 1 | -1/+1 |
| * | | | Add a test case for layout nil. | José Valim | 2012-03-28 | 1 | -0/+1 |
* | | | | Set proper rendered_format when doing render :inline | Santiago Pastorino | 2012-03-28 | 1 | -2/+2 |
|/ / / |
|
* | | | Cover one more case in auth_token and remote forms | Piotr Sarnacki | 2012-03-28 | 1 | -1/+1 |
* | | | config.action_view.embed_authenticity_token_in_remote_forms is true by default | Piotr Sarnacki | 2012-03-28 | 2 | -2/+2 |
* | | | Added config.action_view.embed_authenticity_token_in_remote_forms | Piotr Sarnacki | 2012-03-28 | 2 | -8/+24 |
* | | | Merge pull request #5621 from rafaelfranca/fix-2492-master | Jeremy Kemper | 2012-03-27 | 1 | -3/+3 |
|\ \ \ |
|
| * | | | Check if the options hash already exists and merge it with the another | Rafael Mendonça França | 2012-03-27 | 2 | -12/+5 |
| * | | | Fixing issue #2492 for master branch. ActionView::Base.field_error_proc doesn... | Andrey Samsonov | 2012-03-27 | 1 | -2/+9 |
* | | | | Merge pull request #5620 from jcoleman/textarea-newline-fix-breaks-haml-master | Santiago Pastorino | 2012-03-27 | 2 | -2/+6 |
|\ \ \ \ |
|
| * | | | | Don't break Haml with textarea newline fix. | James Coleman | 2012-03-27 | 2 | -2/+6 |
| | |/ /
| |/| | |
|
* / | | | adds delegetion for eof? to AD::Http::UploadedFile | Jens Fahnenbruck | 2012-03-27 | 1 | -1/+1 |
|/ / / |
|
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-27 | 3 | -2/+21 |
|\ \ \
| |/ /
|/| | |
|
| * | | add missing do [ci skip] | Vijay Dev | 2012-03-27 | 1 | -1/+1 |
| * | | Proc objects for caches_page no need controller object | Alexey Vakhov | 2012-03-27 | 1 | -1/+1 |
| * | | added shallow_prefix option description in documantation | Lukasz Sarnacki | 2012-03-27 | 1 | -0/+19 |