Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use ActiveSupport::Callbacks instead of | Emilio Tagua | 2009-10-13 | 1 | -1/+1 |
| | | | | ActiveSupport::DeprecatedCallbacks. | ||||
* | Merge commit 'rails/master' | Emilio Tagua | 2009-10-13 | 62 | -4019/+2595 |
|\ | |||||
| * | Make logger work again (h/t Sam Ruby) | Yehuda Katz | 2009-10-13 | 1 | -1/+1 |
| | | |||||
| * | Rewrite AS::TestCase setup/teardown as a single callback chain | Joshua Peek | 2009-10-12 | 1 | -27/+30 |
| | | |||||
| * | Get AS TestCase off deprecated callbacks | Joshua Peek | 2009-10-12 | 2 | -55/+15 |
| | | |||||
| * | Add erubis gem to ci | Joshua Peek | 2009-10-12 | 1 | -0/+2 |
| | | |||||
| * | Insert a deprecation warn notice when using AS::DeprecatedCallbacks. | Joshua Peek | 2009-10-12 | 1 | -0/+2 |
| | | | | | | | | | | We are still using DeprecatedCallbacks in AS and AR. This is meant to annoy the shit out of Rails core until we fix it. | ||||
| * | Callbacks, DeprecatedCallbacks = NewCallbacks, Callbacks | Joshua Peek | 2009-10-12 | 15 | -1457/+1263 |
| | | |||||
| * | Use "run_callbacks :foo" since it is the public api for callbacks [#3329 | Joshua Peek | 2009-10-12 | 3 | -19/+19 |
| | | | | | | | | state:resolved] | ||||
| * | Kill unused SafelyMemoizable [#3323 state:resolved] | Joshua Peek | 2009-10-12 | 1 | -13/+0 |
| | | |||||
| * | Bundle with system gem sources rather than gems.rubyforge.org default | Jeremy Kemper | 2009-10-11 | 1 | -0/+2 |
| | | |||||
| * | Fix generators load paths | Jeremy Kemper | 2009-10-11 | 2 | -2/+3 |
| | | |||||
| * | Fix rake dev. | José Valim | 2009-10-11 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Kill mock routing assertion that tests router implementation | Joshua Peek | 2009-10-10 | 1 | -13/+0 |
| | | |||||
| * | Fix failing safe buffer test. We don't patch CGI.escapeHTML, only ERB:Util. | Joshua Peek | 2009-10-10 | 1 | -1/+1 |
| | | |||||
| * | Move safe buffer into test/template | Joshua Peek | 2009-10-10 | 1 | -0/+0 |
| | | |||||
| * | Relative url generations are covered more thoroughly by url rewriter tests | Joshua Peek | 2009-10-10 | 1 | -12/+0 |
| | | |||||
| * | Add define another "stuff" controller to support routing tests | Joshua Peek | 2009-10-10 | 1 | -0/+1 |
| | | |||||
| * | Drop implementation specific routing test assertions | Joshua Peek | 2009-10-10 | 1 | -3/+0 |
| | | |||||
| * | Add define a "stuff" controller in fixtures to support routing tests | Joshua Peek | 2009-10-10 | 1 | -0/+1 |
| | | |||||
| * | Fix a bug where render :text could not handle yield :symbol. Fixes guides ↵ | Yehuda Katz | 2009-10-10 | 1 | -9/+13 |
| | | | | | | | | generation | ||||
| * | Mark html safety | Jeremy Kemper | 2009-10-09 | 1 | -1/+1 |
| | | |||||
| * | Uses fileutils | Jeremy Kemper | 2009-10-09 | 1 | -0/+2 |
| | | |||||
| * | To unmarshal MissingSourceFile from child | Jeremy Kemper | 2009-10-09 | 1 | -1/+3 |
| | | |||||
| * | Add a :limit option to specify the maximum number of records that can be ↵ | Pratik Naik | 2009-10-09 | 2 | -1/+44 |
| | | | | | | | | processed by accepts_nested_attributes_for | ||||
| * | Store entire options hash in the class var rather than just the reject_if ↵ | Pratik Naik | 2009-10-09 | 2 | -16/+19 |
| | | | | | | | | proc for the nested attributes | ||||
| * | Mute log info coming from the local_cache strategy | Pratik Naik | 2009-10-09 | 4 | -5/+33 |
| | | |||||
| * | Fix issue with standalone ActionView | Yehuda Katz | 2009-10-09 | 1 | -1/+4 |
| | | |||||
| * | Avoid super in define_method for Rubinius | Yehuda Katz | 2009-10-09 | 1 | -1/+6 |
| | | |||||
| * | Get rid of constant name usage for stack trace help in favor of overriding ↵ | Yehuda Katz | 2009-10-09 | 1 | -9/+9 |
| | | | | | | | | #inspect and .name. | ||||
| * | Ensure MessageVerifier raises appropriate exception on tampered data | Pratik Naik | 2009-10-09 | 2 | -1/+2 |
| | | |||||
| * | Finish porting over the initializers to the app object and fix all the tests | Carl Lerche | 2009-10-08 | 15 | -837/+482 |
| | | |||||
| * | Even more initializers ported over | Carl Lerche | 2009-10-08 | 4 | -142/+141 |
| | | |||||
| * | Ported over more initializers | Carl Lerche | 2009-10-08 | 4 | -54/+48 |
| | | |||||
| * | Add a test that ensures that Rails::Initializable can be used with modules | Carl Lerche | 2009-10-08 | 1 | -0/+12 |
| | | |||||
| * | Move the ensure_tmp_directories_exist initializer to the application object | Carl Lerche | 2009-10-08 | 2 | -7/+7 |
| | | |||||
| * | Moving more initializers into the application object | Carl Lerche | 2009-10-08 | 8 | -209/+292 |
| | | |||||
| * | Start moving the initializers into the application object | Carl Lerche | 2009-10-08 | 10 | -73/+225 |
| | | |||||
| * | Remove the old initializer file. | Carl Lerche | 2009-10-08 | 1 | -1137/+0 |
| | | |||||
| * | API change: content_tag_for outputs prefixed class name | Joshua Peek | 2009-10-08 | 2 | -4/+4 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-10-08 | 45 | -58/+450 |
|\| | |||||
| * | Fix warning spew for 1.9 | Carl Lerche | 2009-10-08 | 1 | -1/+5 |
| | | |||||
| * | Fix for Ruby 1.9 - define_method throws an exception under 1.9 if given ↵ | Chad Woolley | 2009-10-08 | 1 | -1/+1 |
| | | | | | | | | | | | | incorrect number of args Signed-off-by: Carl Lerche <carllerche@mac.com> | ||||
| * | Ruby 1.9: Fix ActiveResource::ConnectionError#to_s when @response does not ↵ | Chad Woolley | 2009-10-08 | 2 | -2/+5 |
| | | | | | | | | | | | | respond to #code or #message Signed-off-by: Carl Lerche <carllerche@mac.com> | ||||
| * | Don't need h in there now that XSS protection is on by default | Michael Koziarski | 2009-10-08 | 2 | -2/+2 |
| | | |||||
| * | Use indifferent access attributes instead of stringifying them | Pratik Naik | 2009-10-08 | 2 | -2/+10 |
| | | |||||
| * | error procs have to be safe too | Michael Koziarski | 2009-10-08 | 1 | -1/+1 |
| | | |||||
| * | Allow accepts_nested_attributes_for :reject_if option accept symbols for ↵ | Pratik Naik | 2009-10-07 | 3 | -6/+57 |
| | | | | | | | | | | | | | | | | using a method Conflicts: activerecord/lib/active_record/nested_attributes.rb | ||||
| * | Switch to on-by-default XSS escaping for rails. | Michael Koziarski | 2009-10-08 | 36 | -42/+368 |
| | | | | | | | | | | | | | | | | | | | | | | | | This consists of: * String#html_safe! a method to mark a string as 'safe' * ActionView::SafeBuffer a string subclass which escapes anything unsafe which is concatenated to it * Calls to String#html_safe! throughout the rails helpers * a 'raw' helper which lets you concatenate trusted HTML from non-safety-aware sources (e.g. presantized strings in the DB) * New ERB implementation based on erubis which uses a SafeBuffer instead of a String Hat tip to Django for the inspiration. | ||||
| * | Do not ignore .empty_directory files. | José Valim | 2009-10-07 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com> |