| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #2974 from md5/csrf_token_warning | Santiago Pastorino | 2011-09-10 | 1 | -1/+1 |
|\ |
|
| * | Use ensure instead of rescue | Mike Dillon | 2011-09-10 | 1 | -1/+1 |
* | | Merge pull request #2972 from md5/master | Aaron Patterson | 2011-09-10 | 3 | -1/+19 |
|\| |
|
| * | Fix changelog entry | Mike Dillon | 2011-09-10 | 1 | -1/+1 |
| * | Add test for warning and CHANGELOG entry | Mike Dillon | 2011-09-10 | 2 | -0/+18 |
| * | Change log level for CSRF token verification warning | Mike Dillon | 2011-09-10 | 1 | -1/+1 |
* | | No need to use </form> here. It's already in whole_form block | Arun Agrawal | 2011-09-10 | 1 | -2/+1 |
|/ |
|
* | Merge pull request #2876 from alex3/patch-1 | Santiago Pastorino | 2011-09-09 | 1 | -0/+2 |
|\ |
|
| * | Fixed assets precompile regex, now accepts Procs | Alex Yakoubian | 2011-09-08 | 1 | -0/+2 |
* | | Pull up a method we only use once. | Aaron Patterson | 2011-09-08 | 1 | -5/+1 |
* | | Conditions must never be equal | Aaron Patterson | 2011-09-08 | 1 | -6/+1 |
|/ |
|
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-08 | 1 | -2/+2 |
|\ |
|
| * | Fixing `record_key_for_dom_id` documentation.
| Nicolás Hock Isaza | 2011-09-07 | 1 | -1/+1 |
| * | Fix grammar for content_tag_for and div_for docs. | Hendy Tanata | 2011-09-05 | 1 | -2/+2 |
* | | Merge pull request #2499 from akaspick/assert_select_email_fix | Jon Leighton | 2011-09-07 | 2 | -2/+21 |
|\ \ |
|
| * | | fix assert_select_email to work on non-multipart emails as well as converting... | Andrew Kaspick | 2011-08-11 | 2 | -2/+21 |
* | | |
| Nicolás Hock Isaza | 2011-09-06 | 1 | -1/+1 |
* | | | Eliminate newlines in basic auth. fixes #2882 | Aaron Patterson | 2011-09-06 | 2 | -1/+9 |
* | | | Merge pull request #2577 from rails-noob/master | Santiago Pastorino | 2011-09-06 | 1 | -1/+3 |
|\ \ \ |
|
| * | | | Fix bug #2579. | rails-noob | 2011-09-06 | 1 | -1/+3 |
* | | | | Merge pull request #2889 from guilleiguaran/perform-caching-assets | Santiago Pastorino | 2011-09-06 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | config.action_controller.perform_caching isn't used anymore in assets pipelin... | Guillermo Iguaran | 2011-09-06 | 1 | -1/+1 |
* | | | | | Merge pull request #2851 from dasch/patch-6 | Jon Leighton | 2011-09-06 | 1 | -5/+3 |
|\ \ \ \ \ |
|
| * | | | | | No need to use a begin block there | Daniel Schierbeck | 2011-09-04 | 1 | -5/+3 |
| | |_|_|/
| |/| | | |
|
* | | | | | Merge pull request #2872 from sikachu/content_tag_html_safe | Santiago Pastorino | 2011-09-05 | 2 | -1/+13 |
|\ \ \ \ \ |
|
| * | | | | | Make sure that result from content_tag_for with collection is html_safe | Prem Sichanugrist | 2011-09-05 | 2 | -1/+13 |
* | | | | | | Merge pull request #2815 from avakhov/current-page-non-get-requests | Santiago Pastorino | 2011-09-05 | 2 | -2/+16 |
|\ \ \ \ \ \ |
|
| * | | | | | | current_page? returns false for non-GET requests | Alexey Vakhov | 2011-09-02 | 2 | -2/+16 |
* | | | | | | | Merge pull request #2799 from tomstuart/3-1-stable | Santiago Pastorino | 2011-09-05 | 2 | -3/+39 |
* | | | | | | | add blanks between methods | Vijay Dev | 2011-09-05 | 1 | -0/+3 |
| |/ / / / /
|/| | | | | |
|
* | | | | | | Remove empty test | Santiago Pastorino | 2011-09-05 | 1 | -3/+0 |
* | | | | | | Merge pull request #2863 from raybaxter/silence_unitialized_instance_variable... | Santiago Pastorino | 2011-09-04 | 1 | -0/+5 |
|\ \ \ \ \ \ |
|
| * | | | | | | Tests shouldn't produce warnings | Ray Baxter | 2011-09-04 | 1 | -0/+5 |
* | | | | | | | Add entry about Asset behaviour fix to ActionPack ChangeLog | Guillermo Iguaran | 2011-09-04 | 1 | -0/+3 |
| |_|_|/ / /
|/| | | | | |
|
* | | | | | | Merge pull request #2860 from guilleiguaran/fix-assets-behavior | Santiago Pastorino | 2011-09-04 | 1 | -2/+2 |
|\ \ \ \ \ \ |
|
| * | | | | | | AssetNotPrecompiledError should be raise when config.assets.digest = false, c... | Guillermo Iguaran | 2011-09-04 | 1 | -2/+2 |
| |/ / / / / |
|
* / / / / / | * is not allowed in windows file names. Closes #2574 #2847 | Santiago Pastorino | 2011-09-04 | 2 | -1/+1 |
|/ / / / / |
|
* | / / / | if ... nil? is more expensive than unless | Milan Dobrota | 2011-09-04 | 7 | -11/+11 |
| |/ / /
|/| | | |
|
* | | | | Merge pull request #2816 from sikachu/content_tag_for | José Valim | 2011-09-04 | 3 | -7/+89 |
|\ \ \ \ |
|
| * | | | | Make `content_tag_for` and `div_for` accepts the array of records | Prem Sichanugrist | 2011-09-04 | 3 | -7/+89 |
* | | | | | Merge pull request #2835 from guilleiguaran/actionpack-changelog | Santiago Pastorino | 2011-09-03 | 1 | -2/+2 |
* | | | | | fix helpers behavior description | Alexey Vakhov | 2011-09-03 | 1 | -3/+6 |
|/ / / / |
|
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-02 | 2 | -7/+7 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Fix name of parent resource params when declaring nested resources at routes | Carlos Paramio | 2011-09-01 | 1 | -6/+6 |
| * | | | Improve examples: use each instead of for...in | Gabe Berke-Williams | 2011-08-31 | 1 | -1/+1 |
* | | | | CookieJar is enumerable. fixes #2795 | Aaron Patterson | 2011-09-01 | 3 | -0/+23 |
* | | | | Merge pull request #2718 from dasch/patch-5 | Vijay Dev | 2011-09-01 | 1 | -1/+4 |
|\ \ \ \ |
|
| * | | | | Split long string into multiple shorter ones
| Daniel Schierbeck | 2011-08-29 | 1 | -1/+4 |
* | | | | | assets:precompile should not append asset digests when config.assets.digest i... | Sam Pohlenz | 2011-09-01 | 1 | -4/+5 |
* | | | | | Merge pull request #2787 from guilleiguaran/changelogs-3-1-1-master | José Valim | 2011-09-01 | 1 | -1/+10 |
|\ \ \ \ \ |
|