Aaron Patterson
dd752a5de9
Merge pull request #418 from myronmarston/am_observer_doc_updates
...
Add documentation for new observer enable/disable feature.
2011-05-06 10:20:04 -07:00
Myron Marston
99363dcf60
Add documentation for new observer enable/disable feature.
2011-05-06 10:00:14 -07:00
José Valim
9c2c25c1a1
Revert to old semantics, use available_action? instead of action_method?.
2011-05-06 18:44:18 +02:00
José Valim
6acb858d06
Merge pull request #389 from jasonrudolph/always_flush_logger_at_exit
...
Always flush logger at exit
2011-05-06 09:43:57 -07:00
Jason Rudolph
cb2d811ebb
Add test to verify production rake tasks flush logger on exit
2011-05-06 12:25:11 -04:00
Jason Rudolph
59982acd63
Always flush logger at exit
...
Prior to this change, running code via script/runner would demonstrate
different logging behavior than running the same code via a rake task.
In production mode the script/runner approach would always flush the
logger, but the rake-based approach would not automatically flush the
logger. This discrepancy violates the principle of least surprise, and
it could lead to the loss of important production logging data.
This change removes special-case code in the "runner" command, and
replaces it with a general solution to ensure that the logger gets
flushed at exit. This solution works for "runner", "console", "server",
rake tasks, and any other process that loads the Rails environment.
2011-05-06 12:21:21 -04:00
José Valim
cae68d221c
Merge pull request #414 from asanghi/lh5796
...
config.generators.orm = false when skipping active record. LightHouse #5796
2011-05-06 08:35:57 -07:00
Aditya Sanghi
a8cfceca55
be consistent
2011-05-06 21:02:20 +05:30
Aditya Sanghi
cdf1842caa
review fixes
2011-05-06 20:59:15 +05:30
José Valim
0e5adbceb7
Don't pluralize, camelize.
2011-05-06 17:00:59 +02:00
Aditya Sanghi
9b5c29038d
default orm and test_framework to false; change application.rb template accordingly
2011-05-06 20:29:11 +05:30
José Valim
d42bb68430
More updates to ivars list.
2011-05-06 14:57:25 +02:00
José Valim
894bdbd53d
Move variables to underscore format, update protected instance variables list.
2011-05-06 14:57:25 +02:00
Aditya Sanghi
75e1e2175d
When skipping skip active record, mark config.generators.orm to false; LH 5796 remainder
2011-05-06 18:04:20 +05:30
José Valim
be9857c21d
Merge pull request #410 from asanghi/LH6074
...
distance_of_time_in_words calculates wrong no of years
2011-05-06 04:41:24 -07:00
Xavier Noria
29dbccff30
Merge pull request #396 from asanghi/lh_4346
...
Multiparameter POLA (principle of least authority) with respect to time_select fixes. See LH4346
2011-05-06 03:53:17 -07:00
Aditya Sanghi
65a9563209
strip space
2011-05-06 15:51:09 +05:30
Aditya Sanghi
ae7d0d816d
Take leap years into account more seriously when calculating year distance [ #6074 state:resolved]
2011-05-06 15:42:05 +05:30
José Valim
4c755f977c
Merge pull request #408 from etdsoft/master
...
Rails::Server outputs 'http://' even when running over SSL
2011-05-06 02:22:06 -07:00
Daniel Martin
1f1989dee0
Take into account the Rack::Server :SSLEnable option when building the application's URL
2011-05-06 07:22:27 +01:00
José Valim
785ee65ddf
Ensure params wrapper settings are not inherited and calculated each time.
2011-05-06 07:11:06 +02:00
José Valim
41a6d96c1b
Update CHANGELOGs.
2011-05-06 05:53:58 +02:00
José Valim
7adfd02b3f
Merge pull request #400 from arunagw/ruby_prof
...
Adding ruby-prof gem for ruby platform only #jruby
2011-05-05 20:30:29 -07:00
Jon Leighton
030e1d06ca
Merge pull request #399 from ernie/join_conditions_on_join
...
Add association join conditions to JOIN clause, not WHERE
2011-05-05 13:23:15 -07:00
Ernie Miller
9b7cd75db3
Add a test for outer joins with conditions where value IS NULL
2011-05-05 14:34:48 -04:00
Aaron Patterson
f098c80947
Merge pull request #358 from baroquebobcat/fix_find_or_create_master
...
Fix for lighthouse #6741
2011-05-05 11:13:05 -07:00
Arun Agrawal
976a9d99b1
Grouped the ruby-prof into test.
2011-05-05 23:17:07 +05:30
Arun Agrawal
745c9f3736
Removing from duplicate places. Only in Ruby platform needed.
2011-05-05 22:46:23 +05:30
Vishnu Atrai
c62fcaa659
adding ruby-prof gem for ruby platform only #jruby
2011-05-05 22:21:38 +05:30
Ernie Miller
8d270a2abb
Add join conditions to JOIN clause, not WHERE
2011-05-05 12:35:29 -04: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
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 951e18abea
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
