Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | Merge pull request #3270 from kennyj/fix_invalid_regex | Santiago Pastorino | 2011-10-09 | 1 | -1/+1 |
|\ | | | | | (small patch) fix invalid regex in testcase | ||||
| * | fix invalid regex | kennyj | 2011-10-10 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-09 | 5 | -18/+84 |
|\ | |||||
| * | Corrections to the ajax guide recent changes. This guide is very | Vijay Dev | 2011-10-09 | 1 | -32/+26 |
| | | | | | | | | outdated and will need a lot of changes to make it useful for Rails 3+ | ||||
| * | Fix a typo that was mysteriously entered in previous commit | Roy Tomeij | 2011-10-09 | 1 | -1/+1 |
| | | |||||
| * | Add note about how Sass & Sprockets don't match | Roy Tomeij | 2011-10-09 | 1 | -1/+3 |
| | | |||||
| * | Copy editing to improve readability and remove any potential ambiguity | mhutchin | 2011-10-09 | 1 | -8/+8 |
| | | |||||
| * | improving the docs for ajax_on_rails | Karunakar (Ruby) | 2011-10-09 | 1 | -13/+22 |
| | | |||||
| * | copy editing | mhutchin | 2011-10-08 | 1 | -3/+3 |
| | | |||||
| * | copy editing | mhutchin | 2011-10-08 | 1 | -1/+1 |
| | | |||||
| * | Revert "Revert "updated the ajax_on_rails.textile for rails3" because of ↵ | Karunakar (Ruby) | 2011-10-09 | 1 | -4/+65 |
| | | | | | | | | | | | | invalid git user" This reverts commit 5d2ffbb992b4ab875a121761fc0cf14dcaa12033. | ||||
| * | copy editing | mhutchin | 2011-10-09 | 1 | -1/+1 |
| | | | | | | | | "updated the ajax_on_rails.textile for rails3" | ||||
| * | Correct stylesheet filename and remove reference to old stylesheet ↵ | mhutchin | 2011-10-08 | 1 | -1/+1 |
| | | | | | | | | compilation location | ||||
| * | Fix params hash example in AC::Base comment | Alexey Vakhov | 2011-10-08 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3266 from arunagw/warnings_removed | Santiago Pastorino | 2011-10-09 | 3 | -3/+3 |
|\ \ | | | | | | | Warnings removed when running with 1.9.3 | ||||
| * | | Warnings removed when running with 1.9.3 | Arun Agrawal | 2011-10-09 | 3 | -3/+3 |
|/ / | |||||
* | | Merge pull request #3262 from subdigital/master | José Valim | 2011-10-09 | 2 | -3/+26 |
|\ \ | | | | | | | Add optional host option to force_ssl | ||||
| * | | accept optional :host parameter to force_ssl | Ben Scheirman | 2011-10-08 | 2 | -3/+26 |
| | | | |||||
* | | | Merge pull request #3196 from avakhov/patch-am-av-tests-2 | José Valim | 2011-10-09 | 4 | -2/+58 |
|\ \ \ | | | | | | | | | Improve tests method for ActionView::TestCase and ActionMailer::TestCase | ||||
| * | | | normalize arg for ActionView::TestCase tests method | Alexey Vakhov | 2011-10-03 | 2 | -1/+22 |
| | | | | |||||
| * | | | normalize arg for ActionMailer::TestCase tests method | Alexey Vakhov | 2011-10-03 | 2 | -1/+36 |
| | | | | |||||
* | | | | Merge pull request #500 from cyril/patch-1 | Jeremy Kemper | 2011-10-08 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Use quotes for command substitution | ||||
| * | | | | Use quotes for command substitution | Cyril Wack | 2011-05-10 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Fixes an issue when creating a date select with too many options. | Liborio Cannici | 2011-10-08 | 3 | -5/+25 |
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired by dlt https://github.com/dlt/rails/commit/9e615634745dc81598e7b880d52411338d3a7a93 Closes #239. Conflicts: actionpack/CHANGELOG | ||||
* | | | | Isolate rake action tests that should be run under default env | Guillermo Iguaran | 2011-10-08 | 1 | -4/+8 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'guilleiguaran/test-utf8-assets-filename' | Jeremy Kemper | 2011-10-08 | 1 | -8/+4 |
|\ \ \ \ | | | | | | | | | | | | | | | | Closes #3261 | ||||
| * | | | | Test utf8 assets filenames with request instead of manifest lookup | Guillermo Iguaran | 2011-10-08 | 1 | -8/+4 |
| | | | | | |||||
* | | | | | The generator invokes rake with either the :env option, ENV['RAILS_ENV'], or ↵ | Jeremy Kemper | 2011-10-08 | 1 | -3/+5 |
|/ / / / | | | | | | | | | | | | | development. So if Travis has exported RAILS_ENV=test, it'll be used instead of development, breaking these brittle expectations. | ||||
* | | | | Skip broken asset precompilation test on Macs. Issues with NFD vs NFC ↵ | Jeremy Kemper | 2011-10-08 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | normalization on the asset filename. Major red flag with asset lookups! | ||||
* | | | | Don't notify IRC on every single build, just failures and first success ↵ | Jeremy Kemper | 2011-10-08 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | after a string of failures | ||||
* | | | | Disable 1.9.3 builds until upgraded from -preview1 to -rc1 | Jeremy Kemper | 2011-10-08 | 1 | -1/+1 |
| | | | | |||||
* | | | | Add comments to our generated .gitignore, including a note about when to use ↵ | Jeremy Kemper | 2011-10-08 | 1 | -5/+15 |
| | | | | | | | | | | | | | | | | a global gitignore. Remove .sass-cache since we use /tmp/sass-cache, which is already ignored. | ||||
* | | | | Revert "Merge pull request #3254 from arunagw/app_gitignore_sqlnet_log" | Santiago Pastorino | 2011-10-08 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit bb8e0673299899c913d664c0fd3c483d8569846c, reversing changes made to 11687382db08ec1523f71e485c48d6039de25324. | ||||
* | | | | Merge pull request #3254 from arunagw/app_gitignore_sqlnet_log | Santiago Pastorino | 2011-10-08 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Sqlnet should also be ignored into the app gitignore | ||||
| * | | | | Sqlnet should also be ignored into the app gitignore | Arun Agrawal | 2011-10-08 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #3249 from arunagw/query_cache_test_fix | José Valim | 2011-10-08 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fixed BodyProxy.new for tests! for wrong argument | ||||
| * | | | | Fixed BodyProxy.new for tests! for wrong argument | Arun Agrawal | 2011-10-08 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #3250 from arunagw/adding_sqlnet_to_gitignore | José Valim | 2011-10-08 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | sqlnet.log file to gitignore. Generates when running with oracle! | ||||
| * | | | | | sqlnet.log file to gitignore. Generates when running with oracle! | Arun Agrawal | 2011-10-08 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #3252 from avakhov/p-remove-expire_page-dup | José Valim | 2011-10-08 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Remove unnecessary dup in expire_page | ||||
| * | | | | Remove unnecessary dup in expire_page | Alexey Vakhov | 2011-10-08 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | just check to see that the first item in the list is an array | Aaron Patterson | 2011-10-07 | 2 | -1/+10 |
| | | | | |||||
* | | | | fix bad formatting in the assets guide | Vijay Dev | 2011-10-08 | 1 | -1/+1 |
| | | | | |||||
* | | | | testing.rake should set the default task, closes #2564 | José Valim | 2011-10-07 | 2 | -2/+2 |
| | | | | |||||
* | | | | closes #3241 - partial doc fix | Vijay Dev | 2011-10-07 | 2 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #3244 from ugisozols/master | Vijay Dev | 2011-10-07 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | One of the activemodel naming tests wasn't asserting anything. | ||||
| * | | | One of the activemodel naming tests wasn't asserting anything. | Uģis Ozols | 2011-10-07 | 1 | -1/+1 |
| | | | |