aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-11-2073-8477/+881
|\
| * Mocha >= 0.9.0 must be available for Action Pack testsJeremy Kemper2008-11-191-12/+10
| |
| * need to make sure the asset type is cached with it in Cache.. name is ↵Aaron Batalion2008-11-192-2/+8
| | | | | | | | | | | | sufficient, not self Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fixed asset host to not cache objects [#1419 state:resolved]Aaron Batalion2008-11-191-29/+35
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Revert "Simplify benchmarking and rescue". Need a different approach.Pratik Naik2008-11-203-63/+68
| | | | | | | | This reverts commit 3be9134d1cb882f4be3be8d57b2f8bde5ecde887.
| * Simplify benchmarking and rescuePratik Naik2008-11-203-68/+63
| |
| * Reflect default locale change from en-US to enJeremy Kemper2008-11-191-3/+3
| |
| * Enumerable#none? conforms to Ruby 1.8.7 behaviorJeremy Kemper2008-11-192-4/+5
| |
| * Require mocha for tests. Get rid of uses_mocha helper.Jeremy Kemper2008-11-195-189/+167
| |
| * Require mocha before the testcase overrides, otherwise its run method is ↵Jeremy Kemper2008-11-191-18/+6
| | | | | | | | clobbered
| * Eliminate method redefinition warningJeremy Kemper2008-11-191-1/+2
| |
| * Require active_support/secure_random for Ruby 1.9.Akira Matsuda2008-11-191-0/+1
| | | | | | | | | | | | [#1326 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Remove SQL Server cases from tests for latest adapter work to pass rails ↵Ken Collins2008-11-1911-153/+17
| | | | | | | | | | | | expected behavior. Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Remove deprecated ActionController::Base#assign_default_content_type_and_charsetPratik Naik2008-11-192-5/+2
| |
| * Remove reset! as a connection#checkout callbackPratik Naik2008-11-191-1/+1
| |
| * Added Object#try. ( Taken from http://ozmm.org/posts/try.html ) [Chris ↵Pratik Naik2008-11-193-0/+40
| | | | | | | | Wanstrath]
| * Assume that the next version is going to be 2.3 for nowDavid Heinemeier Hansson2008-11-1915-25/+25
| |
| * Changed the default of ActionView#render to assume partials instead of files ↵David Heinemeier Hansson2008-11-196-325/+4
| |\ | | | | | | | | | when not given an options hash [DHH]
| | * Remove deprecated render_component. Please use the plugin from ↵Pratik Naik2008-11-196-325/+4
| | | | | | | | | | | | http://github.com/rails/render_component/tree/master
| * | Changed the default of ActionView#render to assume partials instead of files ↵David Heinemeier Hansson2008-11-196-22/+87
| |/ | | | | | | when not given an options hash [DHH]
| * Another piece of markup removed from environment.rbDavid Heinemeier Hansson2008-11-191-1/+1
| |
| * The docs in environment.rb are not going to be rendered so it doesnt make ↵David Heinemeier Hansson2008-11-191-1/+1
| | | | | | | | sense to mark them up
| * Update doc to make more senseDavid Heinemeier Hansson2008-11-191-1/+1
| |
| * Let polymorphic_path treat an array contains single name as without array ↵Hiroshi Saito2008-11-192-0/+7
| | | | | | | | | | | | [#1386 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Added Enumerable#none? to check that none of the elements match the block ↵Damian Janowski2008-11-193-0/+21
| | | | | | | | | | | | [#1408 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Make optimized named routes respect all reserved options and tie it into ↵Gabe da Silveira2008-11-183-9/+12
| | | | | | | | | | | | UrlRewriter::RESERVED_OPTIONS so it's DRY Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Fix rendering html partial via inline render when with :js format [#1399 ↵Luke Melia2008-11-183-1/+17
| | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Spam more people, the list is nextMichael Koziarski2008-11-181-1/+1
| |
| * Register 'checked' as an HTML boolean attribute.Hongli Lai (Phusion)2008-11-182-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way, 'tag :foo, :type => "checkbox", :checked => false' would output the expected <input type="checkbox" /> instead of the old <input type="checkbox" checked="false" /> The latter would result in a checkbox that's initially checked. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Remove duplicate distribution of prototype and scriptaculous.Michael Koziarski2008-11-184-7384/+0
| | | | | | | | This was previously needed by define_javascript_functions which has been removed for a while.
| * Remove mention of long-dead define_javascript_functionsMichael Koziarski2008-11-181-3/+0
| |
| * Update Prototype to 1.6.0.3 and update script.aculo.us to 1.8.2Thomas Fuchs2008-11-187-921/+1038
| |
| * TimeZone offset tests: use current_period, to ensure TimeZone#utc_offset is ↵gbuesing2008-11-182-1/+3
| | | | | | | | up-to-date
* | alternative resolution to vendor load problemMatt Jones2008-11-201-21/+22
|/ | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Update bundled TZInfo to 0.3.12gbuesing2008-11-18141-172/+90
|
* add vendor/ back to load paths; catch errors in constant loadingMatt Jones2008-11-182-15/+20
| | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* use :en as a default locale (in favor of :en-US)Sven Fuchs2008-11-1815-107/+107
| | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Added config.i18n settings gatherer to config/environment, auto-loading of ↵David Heinemeier Hansson2008-11-187-2/+97
| | | | all locales in config/locales/*.rb,yml, and config/locales/en.yml as a sample locale [DHH]
* Prevent assert_template failures when a render :inline is called before ↵Luke Melia2008-11-172-10/+22
| | | | | | rendering a file-based template [#1383 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Add helper test generators [#1199 state:resolved]Eugene Bolshakov2008-11-1718-45/+179
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Fix a typo in test helperPratik Naik2008-11-181-1/+1
|
* Dont require 'application' when running testsPratik Naik2008-11-181-2/+0
|
* Fix script/consolePratik Naik2008-11-181-2/+0
|
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-11-173-11/+17
|\
| * Fix default_scope to work in combination with named scopesTom Stuart2008-11-173-11/+17
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* | Explicitly require test/unit so tests autorunJeremy Kemper2008-11-171-0/+4
|/
* Fix compatibility with Ruby 1.8 that also has the Miniunit gem installed.Hongli Lai (Phusion)2008-11-171-3/+7
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Explicitly require AS::DurationJeremy Kemper2008-11-171-0/+2
|
* Change usage of defined? to check the rubygems constant existance by a ↵Carlos Paramio2008-11-171-1/+1
| | | | | | rescue block on boot.rb for Ruby 1.9 compatibility Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Use ActiveSupport::TestCase in generated test/test_helper.rbJeremy Kemper2008-11-171-1/+1
|