Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Add backtrace cleaner on test unit railtie. | José Valim | 2010-02-07 | 1 | -6/+0 | |
| | | ||||||
| * | Merge remote branch 'fxn/master' | Jeremy Kemper | 2010-02-06 | 2 | -8/+0 | |
| |\ | ||||||
| | * | removes Kernel#daemonize, which is no longer used | Xavier Noria | 2010-02-06 | 2 | -8/+0 | |
| | | | ||||||
| * | | remove trailing whitespace | RomD | 2010-02-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com> | |||||
| * | | fix usage examples and more to use new invocations | RomD | 2010-02-06 | 2 | -2/+2 | |
| |/ | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com> | |||||
| * | Fix tiny version number from '3.0.0beta' to '3.0.0.beta1', so 'rake install' ↵ | Prem Sichanugrist | 2010-02-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | will be run correctly [#3879 status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Making SafeBuffer << an alias for concat method | Santiago Pastorino | 2010-02-05 | 1 | -5/+2 | |
| | | | | | | | | | | | | [#3848 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Fixed html_safe test cases which weren't testing correctly | Santiago Pastorino and José Ignacio Costa | 2010-02-05 | 1 | -17/+20 | |
| | | | | | | | | | | | | [#3845 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Automatically prefer Yajl or JSON backend over Yaml, if available | Jeremy Kemper | 2010-02-05 | 3 | -3/+18 | |
| | | ||||||
| * | Add yajl-ruby as a JSON parsing backend | Brian Lopez | 2010-02-05 | 3 | -0/+46 | |
| | | | | | | | | | | | | [#2666 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Bump git versions to 3.0.0.beta1 since we've released | Jeremy Kemper | 2010-02-05 | 1 | -1/+1 | |
| | | ||||||
| * | Submarine the rake-gemcutter dep in Rakefiles | Jeremy Kemper | 2010-02-05 | 1 | -4/+5 | |
| | | ||||||
| * | Fix task defines | Jeremy Kemper | 2010-02-04 | 1 | -1/+1 | |
| | | ||||||
| * | Release using gemcutter gem:push tasks | Jeremy Kemper | 2010-02-04 | 1 | -18/+5 | |
| | | ||||||
* | | removes p calls in rdoc examples | Xavier Noria | 2010-02-06 | 1 | -8/+8 | |
| | | ||||||
* | | reformats an example in the rdoc of delegate | Xavier Noria | 2010-02-06 | 1 | -2/+7 | |
| | | ||||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-02-04 | 7 | -57/+30 | |
|\| | | | | | | | | | Conflicts: railties/guides/source/3_0_release_notes.textile | |||||
| * | Merge branch 'master' of gitproxy:rails/rails | José Valim | 2010-02-04 | 2 | -16/+16 | |
| |\ | ||||||
| | * | Homogenize gemspecs and remove the deprecated autorequire | David Heinemeier Hansson | 2010-02-03 | 1 | -15/+15 | |
| | | | ||||||
| | * | Move to 3.0.0.beta | David Heinemeier Hansson | 2010-02-03 | 2 | -2/+2 | |
| | | | ||||||
| * | | Remove instrument! and require thread from AS::Notifications. | José Valim | 2010-02-04 | 4 | -30/+3 | |
| |/ | ||||||
| * | Revert "failing tests in multibyte_chars_test.rb fixed". The bug is in Ruby ↵ | José Valim | 2010-02-02 | 1 | -11/+11 | |
| | | | | | | | | | | | | 1.9.1 p376, not in AS test suite. This reverts commit bf1f70d8776e28f9181faefc4914059b4ad26b99. | |||||
* | | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-02-02 | 2 | -2/+2 | |
|\| | | | | | | | | | | | | | | | Conflicts: activemodel/README activemodel/lib/active_model/errors.rb activemodel/lib/active_model/serialization.rb railties/guides/source/3_0_release_notes.textile | |||||
| * | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-02-02 | 10 | -78/+262 | |
| |\ | ||||||
| * | | Updating copyright dates on all licenses | Mikel Lindsaar | 2010-02-01 | 2 | -2/+2 | |
| | | | ||||||
* | | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-02-01 | 15 | -93/+277 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | failing tests in multibyte_chars_test.rb fixed | Santiago Pastorino | 2010-02-01 | 1 | -11/+11 | |
| | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | |||||
| * | | Convert to class_attribute | Jeremy Kemper | 2010-02-01 | 1 | -4/+4 | |
| | | | ||||||
| * | | Introduce class_attribute to declare inheritable class attributes. Writing ↵ | Jeremy Kemper | 2010-02-01 | 3 | -0/+85 | |
| | | | | | | | | | | | | an attribute on a subclass behaves just like overriding the superclass reader method. Unifies and replaces most usage of cattr_accessor, class_inheritable_attribute, superclass_delegating_attribute, and extlib_inheritable_attribute. | |||||
| * | | Deleted all references to ActionView::SafeBuffer in favor of ↵ | Santiago Pastorino | 2010-01-31 | 1 | -0/+41 | |
| | | | | | | | | | | | | | | | | | | ActiveSupport::SafeBuffer Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | |||||
| * | | For performance reasons, you can no longer call html_safe! on Strings. ↵ | Yehuda Katz | 2010-01-31 | 3 | -54/+120 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, all Strings are always not html_safe?. Instead, you can get a SafeBuffer from a String by calling #html_safe, which will SafeBuffer.new(self). * Additionally, instead of doing concat("</form>".html_safe), you can do safe_concat("</form>"), which will skip both the flag set, and the flag check. * For the first pass, I converted virtually all #html_safe!s to #html_safe, and the tests pass. A further optimization would be to try to use #safe_concat as much as possible, reducing the performance impact if we know up front that a String is safe. | |||||
| * | | Get rails tests running on bundler 0.9 | Carl Lerche | 2010-01-31 | 1 | -9/+1 | |
| |/ | ||||||
| * | deOMGifying Railties, Active Support, and Action Pack | Mikel Lindsaar | 2010-01-31 | 5 | -15/+15 | |
| | | ||||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-01-31 | 2 | -87/+27 | |
|\| | | | | | | | | | Conflicts: activemodel/lib/active_model/state_machine.rb | |||||
| * | superclass_delegating_accessor rewritten to serve as the base for many other ↵ | Yehuda Katz | 2010-01-29 | 2 | -87/+27 | |
| | | | | | | | | kinds of accessors (step 1 of unification) | |||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-01-28 | 171 | -18567/+188 | |
|\| | | | | | | | | | Conflicts: railties/lib/rails/railtie.rb | |||||
| * | Ensure test sets json time format flag | Jeremy Kemper | 2010-01-28 | 1 | -1/+4 | |
| | | ||||||
| * | Time#- with a DateTime argument behaves the same as with a Time argument, ↵ | Geoff Buesing | 2010-01-27 | 3 | -1/+7 | |
| | | | | | | | | i.e. returns the difference between self and arg as a Float [#3476 status:resolved] | |||||
| * | active_support/ordered_hash now requires yaml | snusnu | 2010-01-27 | 1 | -0/+2 | |
| | | ||||||
| * | Remove unbundle changelogs | Jeremy Kemper | 2010-01-27 | 1 | -7/+1 | |
| | | ||||||
| * | Unvendor'd MemCache-Client. Now requires the MemCache Client gem as a ↵ | Mikel Lindsaar | 2010-01-28 | 6 | -1157/+5 | |
| | | | | | | | | dependency - Don't forget to gem bundle buys and girls | |||||
| * | Unvendor'd Builder. Now requires the Builder gem as a dependency | Mikel Lindsaar | 2010-01-28 | 10 | -1041/+3 | |
| | | ||||||
| * | Unbundling TZInfo | Mikel Lindsaar | 2010-01-28 | 142 | -16082/+4 | |
| | | ||||||
| * | Adding custom yaml (de-)serialization for OrderedHash | Gregor Schmidt | 2010-01-27 | 3 | -1/+48 | |
| | | | | | | | | | | | | [#3608 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Update bundled TZInfo to v0.3.16 | Geoff Buesing | 2010-01-26 | 142 | -120/+124 | |
| | | ||||||
| * | Georgetown TimeZone is now mapped to "America/Guyana" instead of ↵ | Geoff Buesing | 2010-01-26 | 3 | -3/+29 | |
| | | | | | | | | "America/Argentina/San_Juan" [#1821 status:resolved] | |||||
| * | Merge remote branch 'fxn/master' | Jeremy Kemper | 2010-01-26 | 6 | -262/+0 | |
| |\ | ||||||
| | * | removes now void extending.rb | Xavier Noria | 2010-01-26 | 2 | -5/+0 | |
| | | | ||||||
| | * | removes Object#extended_by | Xavier Noria | 2010-01-26 | 2 | -11/+0 | |
| | | | ||||||
| | * | removes unused method Object#extend_with_included_modules_from | Xavier Noria | 2010-01-26 | 2 | -19/+0 | |
| | | |