aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert to old semantics, use available_action? instead of action_method?.José Valim2011-05-064-28/+38
|
* Merge pull request #389 from jasonrudolph/always_flush_logger_at_exitJosé Valim2011-05-063-14/+22
|\ | | | | Always flush logger at exit
| * Add test to verify production rake tasks flush logger on exitJason Rudolph2011-05-061-0/+13
| |
| * Always flush logger at exitJason Rudolph2011-05-062-14/+9
|/ | | | | | | | | | | | | | 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.
* Merge pull request #414 from asanghi/lh5796José Valim2011-05-064-12/+20
|\ | | | | config.generators.orm = false when skipping active record. LightHouse #5796
| * be consistentAditya Sanghi2011-05-061-3/+1
| |
| * review fixesAditya Sanghi2011-05-063-6/+11
| |
| * default orm and test_framework to false; change application.rb template ↵Aditya Sanghi2011-05-063-12/+12
| | | | | | | | accordingly
| * When skipping skip active record, mark config.generators.orm to false; LH ↵Aditya Sanghi2011-05-062-1/+6
| | | | | | | | 5796 remainder
* | Don't pluralize, camelize.José Valim2011-05-062-3/+3
| |
* | More updates to ivars list.José Valim2011-05-065-7/+11
| |
* | Move variables to underscore format, update protected instance variables list.José Valim2011-05-066-23/+41
|/
* Merge pull request #410 from asanghi/LH6074José Valim2011-05-062-3/+18
|\ | | | | distance_of_time_in_words calculates wrong no of years
| * strip spaceAditya Sanghi2011-05-061-2/+2
| |
| * Take leap years into account more seriously when calculating year distance ↵Aditya Sanghi2011-05-062-3/+18
| | | | | | | | [#6074 state:resolved]
* | Merge pull request #396 from asanghi/lh_4346Xavier Noria2011-05-062-29/+187
|\ \ | |/ |/| Multiparameter POLA (principle of least authority) with respect to time_select fixes. See LH4346
| * Multiparameter POLA, time_select fixes. See LH4346Aditya Sanghi2011-05-052-29/+187
| |
* | Merge pull request #408 from etdsoft/masterJosé Valim2011-05-061-1/+2
|\ \ | | | | | | Rails::Server outputs 'http://' even when running over SSL
| * | Take into account the Rack::Server :SSLEnable option when building the ↵Daniel Martin2011-05-061-1/+2
|/ / | | | | | | application's URL
* | Ensure params wrapper settings are not inherited and calculated each time.José Valim2011-05-062-4/+28
| |
* | Update CHANGELOGs.José Valim2011-05-063-21/+18
| |
* | Merge pull request #400 from arunagw/ruby_profJosé Valim2011-05-051-5/+3
|\ \ | | | | | | Adding ruby-prof gem for ruby platform only #jruby
| * | Grouped the ruby-prof into test.Arun Agrawal2011-05-051-1/+4
| | |
| * | Removing from duplicate places. Only in Ruby platform needed. Arun Agrawal2011-05-051-2/+1
| | |
| * | adding ruby-prof gem for ruby platform only #jrubyVishnu Atrai2011-05-051-5/+1
| | |
* | | Merge pull request #399 from ernie/join_conditions_on_joinJon Leighton2011-05-052-3/+14
|\ \ \ | | | | | | | | Add association join conditions to JOIN clause, not WHERE
| * | | Add a test for outer joins with conditions where value IS NULLErnie Miller2011-05-051-0/+5
| | | |
| * | | Add join conditions to JOIN clause, not WHEREErnie Miller2011-05-052-3/+9
| |/ /
* | | Merge pull request #358 from baroquebobcat/fix_find_or_create_masterAaron Patterson2011-05-052-3/+30
|\ \ \ | |/ / |/| | Fix for lighthouse #6741
| * | Fix for lighthouse #6741Nick Howard2011-05-012-3/+30
| | | | | | | | | | | | | | | | | | | | | - adds tests for find_or_create_by and find_or_initialize_by on has_many associations - changes the behavior of ActiveRecord::Associations::CollectionProxy#method_missing to differ to ActiveRecord::FinderMethods#find_or_instantiator_by_attributes for arg processing and saving so find_or_create_by's api on associations will be consistent w/ the api for model classes.
* | | Merge pull request #397 from dchelimsky/view-path-decoratorJosé Valim2011-05-050-0/+0
|\ \ \ | | | | | | | | rename test case to better describe use case
| * | | rename test case to better describe use caseDavid Chelimsky2011-04-231-6/+6
| | | |
* | | | Merge pull request #394 from splattael/fix_rake_routes_shows_custom_assetsJosé Valim2011-05-052-1/+10
|\ \ \ \ | | | | | | | | | | Display custom asset routes in `rake routes`
| * | | | Display custom asset routes in `rake routes`Peter Suschlik2011-05-052-1/+10
| | |_|/ | |/| |
* | | | Merge pull request #392 from janx/masterJosé Valim2011-05-053-43/+117
|\ \ \ \ | | | | | | | | | | Patch for performance test: make it run with ruby19/minitest
| * | | | add tests for performance testJan Xie2011-05-052-0/+29
| | | | |
| * | | | minitest/ruby19 compatible performance testJan Xie2011-05-051-43/+88
| |/ / /
* / / / Update respond_with docs to deal better with collections.José Valim2011-05-051-1/+6
|/ / /
* | | Merge pull request #390 from arunagw/jruby_opensslJosé Valim2011-05-052-0/+2
|\ \ \ | | | | | | | | Adding jruby-openssl in Gemfile by default. #jruby
| * | | Adding jruby-openssl in Gemfile by default. #jrubyArun Agrawal2011-05-052-0/+2
| | | |
* | | | Merge pull request #391 from bradleypriest/patch-1José Valim2011-05-051-1/+1
|\ \ \ \ | |/ / / |/| | | Tidying up the language in wrap_parameters.rb
| * | | Tidying up the language in wrap_parameters.rbBradley Priest2011-05-041-1/+1
| | | |
* | | | No longer need to reference mysql2 from gitDavid Heinemeier Hansson2011-05-041-9/+1
|/ / /
* | | Prepare for beta1David Heinemeier Hansson2011-05-049-9/+9
| | |
* | | Only show dump of regular env methods on exception screen (not all the rack ↵David Heinemeier Hansson2011-05-043-5/+8
| | | | | | | | | | | | crap) [DHH]
* | | Dont show the assets mount in rake routesDavid Heinemeier Hansson2011-05-041-1/+2
| | |
* | | ensure query cache is cleared when Rack body is closed, fixes bug reported ↵Aaron Patterson2011-05-042-0/+12
| | | | | | | | | | | | on 951e18abea9c116fc5d6b330ca1dcd2890abe006
* | | Bump up rack-cache, tzinfo and thorSantiago Pastorino2011-05-043-4/+4
| | |
* | | Merge branch 'master' of github.com:rails/railsXavier Noria2011-05-042-3/+4
|\ \ \
| * \ \ Merge pull request #387 from smartinez87/remove_method.José Valim2011-05-042-3/+4
| |\ \ \ | | | | | | | | | | Use #remove_possible_method instead