aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-10-145-31/+15
|\
| * Refactor AS concern to avoid hacking the "include" method.Joshua Peek2009-10-133-24/+10
| * Extend Callbacks and Rescuable with AS concernJoshua Peek2009-10-132-7/+5
* | Use ActiveSupport::Callbacks instead ofEmilio Tagua2009-10-131-1/+1
* | Merge commit 'rails/master'Emilio Tagua2009-10-1362-4019/+2595
|\|
| * Make logger work again (h/t Sam Ruby)Yehuda Katz2009-10-131-1/+1
| * Rewrite AS::TestCase setup/teardown as a single callback chainJoshua Peek2009-10-121-27/+30
| * Get AS TestCase off deprecated callbacksJoshua Peek2009-10-122-55/+15
| * Add erubis gem to ciJoshua Peek2009-10-121-0/+2
| * Insert a deprecation warn notice when using AS::DeprecatedCallbacks.Joshua Peek2009-10-121-0/+2
| * Callbacks, DeprecatedCallbacks = NewCallbacks, CallbacksJoshua Peek2009-10-1215-1457/+1263
| * Use "run_callbacks :foo" since it is the public api for callbacks [#3329Joshua Peek2009-10-123-19/+19
| * Kill unused SafelyMemoizable [#3323 state:resolved]Joshua Peek2009-10-121-13/+0
| * Bundle with system gem sources rather than gems.rubyforge.org defaultJeremy Kemper2009-10-111-0/+2
| * Fix generators load pathsJeremy Kemper2009-10-112-2/+3
| * Fix rake dev.José Valim2009-10-111-1/+1
| * Kill mock routing assertion that tests router implementationJoshua Peek2009-10-101-13/+0
| * Fix failing safe buffer test. We don't patch CGI.escapeHTML, only ERB:Util.Joshua Peek2009-10-101-1/+1
| * Move safe buffer into test/templateJoshua Peek2009-10-101-0/+0
| * Relative url generations are covered more thoroughly by url rewriter testsJoshua Peek2009-10-101-12/+0
| * Add define another "stuff" controller to support routing testsJoshua Peek2009-10-101-0/+1
| * Drop implementation specific routing test assertionsJoshua Peek2009-10-101-3/+0
| * Add define a "stuff" controller in fixtures to support routing testsJoshua Peek2009-10-101-0/+1
| * Fix a bug where render :text could not handle yield :symbol. Fixes guides gen...Yehuda Katz2009-10-101-9/+13
| * Mark html safetyJeremy Kemper2009-10-091-1/+1
| * Uses fileutilsJeremy Kemper2009-10-091-0/+2
| * To unmarshal MissingSourceFile from childJeremy Kemper2009-10-091-1/+3
| * Add a :limit option to specify the maximum number of records that can be proc...Pratik Naik2009-10-092-1/+44
| * Store entire options hash in the class var rather than just the reject_if pro...Pratik Naik2009-10-092-16/+19
| * Mute log info coming from the local_cache strategyPratik Naik2009-10-094-5/+33
| * Fix issue with standalone ActionViewYehuda Katz2009-10-091-1/+4
| * Avoid super in define_method for RubiniusYehuda Katz2009-10-091-1/+6
| * Get rid of constant name usage for stack trace help in favor of overriding #i...Yehuda Katz2009-10-091-9/+9
| * Ensure MessageVerifier raises appropriate exception on tampered dataPratik Naik2009-10-092-1/+2
| * Finish porting over the initializers to the app object and fix all the testsCarl Lerche2009-10-0815-837/+482
| * Even more initializers ported overCarl Lerche2009-10-084-142/+141
| * Ported over more initializersCarl Lerche2009-10-084-54/+48
| * Add a test that ensures that Rails::Initializable can be used with modulesCarl Lerche2009-10-081-0/+12
| * Move the ensure_tmp_directories_exist initializer to the application objectCarl Lerche2009-10-082-7/+7
| * Moving more initializers into the application objectCarl Lerche2009-10-088-209/+292
| * Start moving the initializers into the application objectCarl Lerche2009-10-0810-73/+225
| * Remove the old initializer file.Carl Lerche2009-10-081-1137/+0
| * API change: content_tag_for outputs prefixed class nameJoshua Peek2009-10-082-4/+4
* | Merge commit 'rails/master'Emilio Tagua2009-10-0845-58/+450
|\|
| * Fix warning spew for 1.9Carl Lerche2009-10-081-1/+5
| * Fix for Ruby 1.9 - define_method throws an exception under 1.9 if given incor...Chad Woolley2009-10-081-1/+1
| * Ruby 1.9: Fix ActiveResource::ConnectionError#to_s when @response does not re...Chad Woolley2009-10-082-2/+5
| * Don't need h in there now that XSS protection is on by defaultMichael Koziarski2009-10-082-2/+2
| * Use indifferent access attributes instead of stringifying themPratik Naik2009-10-082-2/+10
| * error procs have to be safe tooMichael Koziarski2009-10-081-1/+1