Commit Graph

26079 Commits

Author SHA1 Message Date
Tadas Tamošauskas
ebf69ab163 Object#in? also accepts multiple parameters 2011-11-26 23:51:09 +00:00
Santiago Pastorino
4cdd44e3e0 Merge pull request #3668 from gregolsen/api_docstring_fix
updating API docstring so that user can infer default value
2011-11-19 11:52:44 -08:00
José Valim
43158e58b2 Merge pull request #3696 from lest/fix-plugin-generator
fix rails plugin new CamelCasedName bug
2011-11-19 11:04:39 -08:00
lest
c220b4d833 fix warning about instance variable in plugin generator 2011-11-19 21:58:30 +03:00
lest
39d2251d8a fix rails plugin new CamelCasedName bug
refs #3684
2011-11-19 19:09:09 +02:00
Yehuda Katz
bc04455f10 Merge pull request #3695 from tobiassvn/partial_path_error
Meaningful errors for unexpected partial arguments. Fixes #3573
2011-11-19 07:38:22 -08:00
Jon Leighton
fec85cf10d Perf fix
If we're deleting all records in an association, don't add a IN(..)
clause to the query.

Fixes #3672.
2011-11-19 14:11:29 +00:00
Jon Leighton
2ef4947ab0 Add missing CHANGELOG entry for #3678. Closes #3678. 2011-11-19 13:34:50 +00:00
Jon Leighton
603a679e87 Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685. 2011-11-19 13:28:07 +00:00
Jon Leighton
86b5e81e8a Bump sprockets to 2.1.1 2011-11-19 13:08:34 +00:00
Tobias Svensson
771635e858 Meaningful errors for unexpected partial arguments. Fixes #3573 2011-11-19 13:05:57 +00:00
Jon Leighton
11afb74089 Merge pull request #3687 from kennyj/fix_3678-2
Use `show index from`. We could fix `pk_and_sequence_for` method's performance problem (GH #3678)
2011-11-19 05:00:37 -08:00
Jon Leighton
9c37416a3e Verify that #3690 has been closed by previous changes to the mysql
adapters.

These tests fail on the v3.1.2 tag.

Closes #3690.
2011-11-19 12:34:15 +00:00
Yehuda Katz
89bbb6ce21 Merge pull request #3689 from arunagw/warning_removed_actionpack
Warning removed for shadowing variable
2011-11-18 22:42:14 -08:00
Arun Agrawal
d806ea2050 Warning removed for shadowing variable 2011-11-19 11:29:29 +05:30
kennyj
f9b9179016 Use show index from. We could fix pk_and_sequence_for method's performance problem (GH #3678) 2011-11-19 04:19:31 +09:00
Aaron Patterson
396ef44be4 Revert "make sure to require the right deprecation warning file"
This reverts commit 9d725e3df502a07222f35576108eb2df2bd88259.
2011-11-18 10:51:12 -08:00
Aaron Patterson
99d94f126d Refactoring the redirect method for the router api. 2011-11-18 10:51:12 -08:00
Aaron Patterson
d34efdd260 moving redirection to objects 2011-11-18 10:51:12 -08:00
Aaron Patterson
0809c675ef remove the :path feature to redirects, since it cannot work 2011-11-18 10:51:11 -08:00
Aaron Patterson
a8a4264858 make sure to require the right deprecation warning file 2011-11-18 10:51:11 -08:00
Aaron Patterson
163b645472 arity check has been pushed up, so no need for proc wrapping 2011-11-18 10:51:11 -08:00
Aaron Patterson
4589b2419b require that all blocks have arity of 2 2011-11-18 10:51:11 -08:00
Aaron Patterson
3178cc9a80 copy options keys to the right place so that undo will work correctly 2011-11-18 10:51:11 -08:00
Aaron Patterson
ecbae99478 no need for type checking 2011-11-18 10:51:11 -08:00
Aaron Patterson
636405d2a6 cleaning up variable names to match method parameter names 2011-11-18 10:51:10 -08:00
Aaron Patterson
33543ac871 stop doing is_a? checks on the resource type 2011-11-18 10:51:10 -08:00
Aaron Patterson
648f6113d1 move constants to methods since nothing else is using them 2011-11-18 10:51:10 -08:00
Aaron Patterson
7459ba4f6c pushing hash validation up 2011-11-18 10:51:10 -08:00
Aaron Patterson
494ab25772 breaking match down to smaller methods 2011-11-18 10:51:10 -08:00
Aaron Patterson
76780c34f5 some refactoring of the match method 2011-11-18 10:51:09 -08:00
Vijay Dev
dda6787f44 mailer guide - update info about using default host. Fixes #3642 2011-11-19 00:07:50 +05:30
Vijay Dev
48b580a03b Merge branch 'master' of github.com:lifo/docrails 2011-11-18 23:11:46 +05:30
Vijay Dev
9d035292ba remove unneeded params from issue tracker url 2011-11-18 23:10:12 +05:30
Vijay Dev
5a2db4c7c3 put back the removed eg 2011-11-18 23:09:30 +05:30
Aaron Patterson
2debbe1581 Merge pull request #3683 from christos/schema_introspection_speedup
Only used detailed schema introspection when doing a schema dump.
2011-11-18 09:37:29 -08:00
Vijay Dev
581ba1d946 Merge pull request #3681 from sikachu/fix_test_variable
Update variable's name in the test case to reflect the class we're testing
2011-11-18 09:33:26 -08:00
Christos Zisopoulos
280b2b725b Only used detailed schema introspection when doing a schema dump.
Fixes #3678
2011-11-18 18:29:47 +01:00
Prem Sichanugrist
0e2156d334 Update variable's name in the test case to reflect the class we're testing 2011-11-18 11:51:05 -05:00
Jon Leighton
d4119e144a Merge pull request #3680 from rubys/master
This fix causes the AWDwR test to go back to being green on Rails master.
2011-11-18 07:21:57 -08:00
Sam Ruby
42954c426b Stop db:seed from performing a reload of the db
Fix regression introduced by 38d26b0cb5
2011-11-18 10:05:06 -05:00
Vijay Dev
1c4564b620 Merge pull request #3666 from oscardelben/databases_rake_cleanup
Cleanup of databases.rake psql env variables
2011-11-18 04:21:56 -08:00
Xavier Noria
307fc122f6 release instructions: new section about docs generation 2011-11-18 13:05:25 +01:00
Philip Arndt
bc9b1e0a10 Fixed typo: expect -> expected 2011-11-18 23:50:14 +13:00
Vijay Dev
96792d2756 Merge pull request #3669 from parndt/patch-1
Fixed typo: expect -> expected
2011-11-17 23:40:33 -08:00
Edward Anderson
fe88745d5f Fix a number_with_delimiter :separator example 2011-11-17 20:10:49 -05:00
lest
e8d57f361a _html translation should escape interpolated arguments 2011-11-17 23:07:39 +00:00
Xavier Noria
1079724fe6 Revert "warn the user values are directly interpolated into _html translation strings"
Reason: After another round of discussion, it has been
decided to let interpolation deal with unsafe strings
as it should do.

This reverts commit d57d8098fc.
2011-11-17 23:59:19 +01:00
Aaron Patterson
a437986f43 allow people to set a local .Gemfile so that things like ruby-debug are not required for regular development 2011-11-17 14:41:53 -08:00
Xavier Noria
d57d8098fc warn the user values are directly interpolated into _html translation strings 2011-11-17 23:07:06 +01:00