aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove redundant check for is_a?(String)Burke Libbey2011-05-062-2/+2
* Added a test for MissingTemplate change, and changed to use Array.wrap() asBurke Libbey2011-05-063-2/+11
* Made ActionView::MissingTemplate#initialize optionally accept a single stringBurke Libbey2011-05-061-0/+1
* Merge pull request #419 from smartinez87/avail_actionJosé Valim2011-05-061-2/+2
|\
| * better styling on #available_action? docsSebastian Martinez2011-05-061-2/+2
* | Merge pull request #418 from myronmarston/am_observer_doc_updatesAaron Patterson2011-05-063-3/+53
|\ \ | |/ |/|
| * Add documentation for new observer enable/disable feature.Myron Marston2011-05-063-3/+53
|/
* 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
|\
| * 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
|/
* Merge pull request #414 from asanghi/lh5796José Valim2011-05-064-12/+20
|\
| * 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 accor...Aditya Sanghi2011-05-063-12/+12
| * When skipping skip active record, mark config.generators.orm to false; LH 579...Aditya Sanghi2011-05-062-1/+6
* | 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
|\
| * strip spaceAditya Sanghi2011-05-061-2/+2
| * Take leap years into account more seriously when calculating year distance [#...Aditya Sanghi2011-05-062-3/+18
* | Merge pull request #396 from asanghi/lh_4346Xavier Noria2011-05-062-29/+187
|\ \ | |/ |/|
| * Multiparameter POLA, time_select fixes. See LH4346Aditya Sanghi2011-05-052-29/+187
* | Merge pull request #408 from etdsoft/masterJosé Valim2011-05-061-1/+2
|\ \
| * | Take into account the Rack::Server :SSLEnable option when building the applic...Daniel Martin2011-05-061-1/+2
|/ /
* | 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
|\ \
| * | 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 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 #6741Nick Howard2011-05-012-3/+30
* | | Merge pull request #397 from dchelimsky/view-path-decoratorJosé Valim2011-05-050-0/+0
|\ \ \
| * | | 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`Peter Suschlik2011-05-052-1/+10
| | |_|/ | |/| |
* | | | Merge pull request #392 from janx/masterJosé Valim2011-05-053-43/+117
|\ \ \ \
| * | | | 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. #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.rbBradley Priest2011-05-041-1/+1
* | | | No longer need to reference mysql2 from gitDavid Heinemeier Hansson2011-05-041-9/+1
|/ / /