Commit Graph

25511 Commits

Author SHA1 Message Date
Denis Odorcic
a0a68ecbb2 JSON responder should return errors with :error root 2011-10-10 01:42:12 -04:00
Jon Leighton
3456ef1119 Use broken YAML that will fail with Syck as well as Psych. Fixes test_broken_yaml_exception in fixtures_test.rb on Ruby 1.8.7.
Cherry-pick from 3-1-stable: b8d46924e70e0847e92e1d2dbaaec8c11381072c
2011-10-09 16:47:53 -07:00
Jeremy Kemper
8dba127188 Remove stray whitespace 2011-10-09 14:21:12 -07:00
Joseph Palermo
c90e5ce779 Only use LOWER for mysql case insensitive uniqueness check when column has a case sensitive collation. 2011-10-09 13:14:07 -07:00
Santiago Pastorino
8f8fd4f3aa Merge pull request #3270 from kennyj/fix_invalid_regex
(small patch) fix invalid regex in testcase
2011-10-09 10:42:21 -07:00
kennyj
6d05597d0f fix invalid regex 2011-10-10 01:54:54 +09:00
Vijay Dev
a2edc884f3 Merge branch 'master' of github.com:lifo/docrails 2011-10-09 20:10:53 +05:30
Santiago Pastorino
1774ec7464 Merge pull request #3266 from arunagw/warnings_removed
Warnings removed when running with 1.9.3
2011-10-09 07:34:56 -07:00
Vijay Dev
3a72c01be2 Corrections to the ajax guide recent changes. This guide is very
outdated and will need a lot of changes to make it useful for Rails 3+
2011-10-09 19:58:14 +05:30
Arun Agrawal
ca219a21b6 Warnings removed when running with 1.9.3 2011-10-09 17:15:55 +05:30
Roy Tomeij
d214e54e7a Fix a typo that was mysteriously entered in previous commit 2011-10-09 13:45:54 +02:00
Roy Tomeij
da773a24be Add note about how Sass & Sprockets don't match 2011-10-09 13:38:47 +02:00
José Valim
2ed66feae0 Merge pull request #3262 from subdigital/master
Add optional host option to force_ssl
2011-10-09 02:52:42 -07:00
José Valim
501e5b0d7f Merge pull request #3196 from avakhov/patch-am-av-tests-2
Improve tests method for ActionView::TestCase and ActionMailer::TestCase
2011-10-09 02:15:19 -07:00
mhutchin
9de9f6b4d0 Copy editing to improve readability and remove any potential ambiguity 2011-10-09 01:50:53 -07:00
Karunakar (Ruby)
43baad78f7 improving the docs for ajax_on_rails 2011-10-09 12:49:38 +05:30
mhutchin
ac8555b5a0 copy editing 2011-10-08 23:02:33 -07:00
mhutchin
3deb35ea5c copy editing 2011-10-08 22:45:31 -07:00
Jeremy Kemper
bedd6dcd43 Merge pull request #500 from cyril/patch-1
Use quotes for command substitution
2011-10-08 20:29:56 -07:00
Liborio Cannici
114218e4da Fixes an issue when creating a date select with too many options.
Inspired by dlt 9e61563474

Closes #239.

Conflicts:

	actionpack/CHANGELOG
2011-10-08 18:02:15 -07:00
Ben Scheirman
d68f27e9b1 accept optional :host parameter to force_ssl 2011-10-08 18:38:02 -05:00
Guillermo Iguaran
f655895e87 Isolate rake action tests that should be run under default env 2011-10-08 16:44:40 -05:00
Jeremy Kemper
2274c9212e Merge remote-tracking branch 'guilleiguaran/test-utf8-assets-filename'
Closes #3261
2011-10-08 13:29:19 -07:00
Guillermo Iguaran
b111b41d13 Test utf8 assets filenames with request instead of manifest lookup 2011-10-08 15:24:52 -05:00
Jeremy Kemper
4888aba15f The generator invokes rake with either the :env option, ENV['RAILS_ENV'], or development. So if Travis has exported RAILS_ENV=test, it'll be used instead of development, breaking these brittle expectations. 2011-10-08 13:09:28 -07:00
Jeremy Kemper
9ce03d1542 Skip broken asset precompilation test on Macs. Issues with NFD vs NFC normalization on the asset filename. Major red flag with asset lookups! 2011-10-08 12:56:06 -07:00
Karunakar (Ruby)
6a5eeab3cd Revert "Revert "updated the ajax_on_rails.textile for rails3" because of invalid git user"
This reverts commit 5d2ffbb992b4ab875a121761fc0cf14dcaa12033.
2011-10-09 00:18:16 +05:30
mhutchin
62c03816e8 copy editing
"updated the ajax_on_rails.textile for rails3"
2011-10-09 00:17:21 +05:30
Jeremy Kemper
0d0ded39ef Don't notify IRC on every single build, just failures and first success after a string of failures 2011-10-08 11:13:48 -07:00
Jeremy Kemper
8a6acc17bb Disable 1.9.3 builds until upgraded from -preview1 to -rc1 2011-10-08 11:13:12 -07:00
Jeremy Kemper
1851791803 Add comments to our generated .gitignore, including a note about when to use a global gitignore. Remove .sass-cache since we use /tmp/sass-cache, which is already ignored. 2011-10-08 08:04:05 -07:00
Santiago Pastorino
96e1dc3440 Revert "Merge pull request #3254 from arunagw/app_gitignore_sqlnet_log"
This reverts commit bb8e0673299899c913d664c0fd3c483d8569846c, reversing
changes made to 11687382db08ec1523f71e485c48d6039de25324.
2011-10-08 12:54:24 -02:00
Santiago Pastorino
bb8e067329 Merge pull request #3254 from arunagw/app_gitignore_sqlnet_log
Sqlnet should also be ignored into the app gitignore
2011-10-08 05:47:33 -07:00
Arun Agrawal
6c9090d192 Sqlnet should also be ignored into the app gitignore 2011-10-08 14:39:19 +05:30
mhutchin
b2deeabffb Correct stylesheet filename and remove reference to old stylesheet compilation location 2011-10-08 01:58:57 -07:00
José Valim
11687382db Merge pull request #3249 from arunagw/query_cache_test_fix
Fixed BodyProxy.new for tests! for wrong argument
2011-10-08 01:17:57 -07:00
José Valim
135a97af76 Merge pull request #3250 from arunagw/adding_sqlnet_to_gitignore
sqlnet.log file to gitignore. Generates when running with oracle!
2011-10-08 01:17:28 -07:00
José Valim
cf92e41513 Merge pull request #3252 from avakhov/p-remove-expire_page-dup
Remove unnecessary dup in expire_page
2011-10-08 01:15:21 -07:00
Alexey Vakhov
a4515b60e3 Remove unnecessary dup in expire_page 2011-10-08 11:01:31 +04:00
Alexey Vakhov
22b6e829dc Fix params hash example in AC::Base comment 2011-10-08 10:12:58 +04:00
Arun Agrawal
1e8feb8440 sqlnet.log file to gitignore. Generates when running with oracle! 2011-10-08 10:06:19 +05:30
Arun Agrawal
34d950b066 Fixed BodyProxy.new for tests! for wrong argument 2011-10-08 10:01:58 +05:30
Aaron Patterson
7f64e47277 just check to see that the first item in the list is an array 2011-10-07 16:56:18 -07:00
Vijay Dev
d2db917841 fix bad formatting in the assets guide 2011-10-08 02:22:49 +05:30
José Valim
8a4239fc7e testing.rake should set the default task, closes #2564 2011-10-07 22:25:10 +02:00
Vijay Dev
0d3d9a150a closes #3241 - partial doc fix 2011-10-07 23:53:12 +05:30
Vijay Dev
bec61bd1ea Merge pull request #3244 from ugisozols/master
One of the activemodel naming tests wasn't asserting anything.
2011-10-07 10:26:45 -07:00
Vijay Dev
4930f9d2a7 Merge branch 'master' of github.com:lifo/docrails 2011-10-07 22:20:29 +05:30
Vijay Dev
cb244f4f70 use https for github url 2011-10-07 22:19:55 +05:30
mhutchin
fca2613ec4 Correct formatting 2011-10-07 08:26:05 -07:00