Commit Graph

22399 Commits

Author SHA1 Message Date
Richard Millan
d53b406a76 Test: identity on inherited classes should behave the same when turned on or off 2011-05-05 07:28:51 -07:00
José Valim
ee898e5248 Merge pull request #397 from dchelimsky/view-path-decorator
rename test case to better describe use case
2011-05-05 05:14:40 -07:00
Richard Millan
564922b32c Testing identity map on inherited active record classes. Distinct models that use the same database table shouldn't be retrieved as the same object when there is not a type attribute. 2011-05-05 04:52:42 -07:00
José Valim
5e1960ea20 Merge pull request #394 from splattael/fix_rake_routes_shows_custom_assets
Display custom asset routes in `rake routes`
2011-05-05 03:32:55 -07:00
Peter Suschlik
97f9000cf2 Display custom asset routes in rake routes 2011-05-05 12:14:40 +02:00
Aditya Sanghi
7d0f26796d Multiparameter POLA, time_select fixes. See LH4346 2011-05-05 15:41:14 +05:30
José Valim
008b178a90 Merge pull request #392 from janx/master
Patch for performance test: make it run with ruby19/minitest
2011-05-05 03:08:32 -07:00
José Valim
ffe731c922 Update respond_with docs to deal better with collections. 2011-05-05 03:01:15 -07:00
Jan Xie
ebc5ef0e66 add tests for performance test 2011-05-05 17:15:22 +08:00
Jan Xie
25288c137c minitest/ruby19 compatible performance test 2011-05-05 16:11:49 +08:00
José Valim
3e9bb5459c Merge pull request #390 from arunagw/jruby_openssl
Adding jruby-openssl in Gemfile by default. #jruby
2011-05-05 00:30:42 -07:00
José Valim
65fd004da4 Merge pull request #391 from bradleypriest/patch-1
Tidying up the language in wrap_parameters.rb
2011-05-05 00:24:58 -07:00
Bradley Priest
a9fb5116d7 Tidying up the language in wrap_parameters.rb 2011-05-04 23:04:30 -07:00
Arun Agrawal
2f331fd9b2 Adding jruby-openssl in Gemfile by default. #jruby 2011-05-05 08:30:26 +05:30
David Heinemeier Hansson
e99c1e3a3b No longer need to reference mysql2 from git 2011-05-04 21:08:36 -05:00
David Heinemeier Hansson
169ae75e09 Prepare for beta1 2011-05-04 20:21:05 -05:00
David Heinemeier Hansson
5b8801442e Only show dump of regular env methods on exception screen (not all the rack crap) [DHH] 2011-05-04 19:56:56 -05:00
David Heinemeier Hansson
9f062970ca Dont show the assets mount in rake routes 2011-05-04 19:24:41 -05:00
Aaron Patterson
38d92d705e ensure query cache is cleared when Rack body is closed, fixes bug reported on 951e18abea9c116fc5d6b330ca1dcd2890abe006 2011-05-04 15:24:26 -07:00
Santiago Pastorino
bd4831d699 Bump up rack-cache, tzinfo and thor 2011-05-04 16:47:48 -03:00
Xavier Noria
aada1a4f78 Merge branch 'master' of github.com:rails/rails 2011-05-04 20:15:34 +02:00
Xavier Noria
47e1cca5dc Merge branch 'master' of git://github.com/lifo/docrails 2011-05-04 20:15:00 +02:00
José Valim
871096d854 Merge pull request #387 from smartinez87/remove_method.
Use #remove_possible_method instead
2011-05-04 11:14:57 -07:00
Sebastian Martinez
9be7911e87 Use #remove_possible_method instead here 2011-05-04 15:13:40 -03:00
Vijay Dev
2076295aba commented meta code 2011-05-04 23:42:29 +05:30
José Valim
afc3ccf74c Fix renew feature on cookies. 2011-05-04 20:12:27 +02:00
Vijay Dev
3e7a8ccdc4 formatting results in comments 2011-05-04 23:38:21 +05:30
Sebastian Martinez
1c2dc92aae Use #remove_possible_method instead 2011-05-04 15:07:34 -03:00
José Valim
6b79463ed8 Fix .subdomain regression. 2011-05-04 20:05:35 +02:00
José Valim
a93bd11b1d Use remove possible method here. 2011-05-04 19:31:43 +02:00
José Valim
85b8a88d87 Relax this dependency a bit. 2011-05-04 19:30:23 +02:00
José Valim
f6dc816367 Let's run those precious tests against the gem. 2011-05-04 18:46:19 +02:00
José Valim
92661b0c50 Move sandbox to AR and pass the sandbox as a value. This way, other ORMs like Datamapper can also have their own sandboxing in rails console. 2011-05-04 16:47:35 +02:00
José Valim
b9bba555ca Remove defined?(ActiveRecord) and use the railtie hook instead. 2011-05-04 16:32:24 +02:00
Xavier Noria
cea3b3cc9d Merge branch 'master' of git://github.com/lifo/docrails 2011-05-04 14:51:04 +02:00
Xavier Noria
897318f4ee fixes typo in railties/CHANGELOG (spotted by Vijay Dev) 2011-05-04 12:10:38 +02:00
José Valim
1632a3a49f More AV::Base cleanup. 2011-05-04 12:07:37 +02:00
Xavier Noria
30bb17e5e0 Merge pull request #384 from arunagw/new_plugin_test.
Fixed tests for new_plugin_generator.
2011-05-04 02:54:18 -07:00
Arun Agrawal
dd9200c32e Fixed tests for new_plugin_generator. 2011-05-04 15:07:06 +05:30
José Valim
6afc900191 Move prefixes to view paths as they are now a lookup context dependency. 2011-05-04 11:28:37 +02:00
Xavier Noria
d9c39c3ae9 restores the -j option, but now it accepts the name of any library
If passed "foo", a gem "foo-rails" is added to the Gemfile
and "foo" and "foo_ujs" are required in the application
JavaScript manifest.
2011-05-04 10:33:53 +02:00
Xavier Noria
5d2cdb190a removes the :update_ujs task in railties 2011-05-04 10:33:53 +02:00
Xavier Noria
33567d1d7b jQuery is no longer vendored 2011-05-04 10:33:53 +02:00
José Valim
c9fa3f03fe Also allow prefixes as third argument to lookup context. 2011-05-04 09:07:11 +02:00
José Valim
4758d37044 Merge remote branch 'apotonick/presentation' 2011-05-04 08:37:59 +02:00
Sebastian Martinez
24586edae2 Remove extra whitespaces 2011-05-03 21:38:19 -03:00
Sebastian Martinez
0ee2513356 Improves Mysql2 adapter docs 2011-05-03 21:26:02 -03:00
Sebastian Martinez
fab9bb77bf Added #recreate_database docs 2011-05-03 21:25:38 -03:00
Sebastian Martinez
f049062497 Fixes on schema_definitions docs 2011-05-03 21:11:17 -03:00
Nick Sutterer
eb327c1bab no @controller dependency in Renderers. 2011-05-04 00:12:11 +02:00