Commit Graph

2225 Commits

Author SHA1 Message Date
Santiago Pastorino
85980852a0 make a throwaway value equals to _ to avoid warnings
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-07-24 01:19:55 +02:00
Santiago Pastorino
e1d4e78b15 Removes unused vars
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-07-24 01:19:44 +02:00
Neeraj Singh
8429e7b45b making comments sentence more concise 2010-07-23 16:22:17 -04:00
Neeraj Singh
46c7a991a2 fixing typo 2010-07-23 16:14:16 -04:00
Neeraj Singh
4bf6c1c0c0 adding proper markup in comments 2010-07-23 14:27:14 -04:00
Neeraj Singh
34165176cf shortening the sentences and removing fluff 2010-07-23 14:21:03 -04:00
Neeraj Singh
8f638d8cc1 reformatting sentence 2010-07-23 14:11:14 -04:00
Santiago Pastorino
21c4b0942f Don't shadow outer local variables 2010-07-22 15:48:52 -03:00
Carlhuda
ba8d89c4c8 Performance optimizations to handle cases of instrumentors that are not listened to. Also, fix a possible concurrency issue. 2010-07-22 11:36:16 -07:00
Xavier Noria
b456877cfb camelize and underscore are sort of inverse of each other, but not in a mathematical sense [#5174 state:resolved] 2010-07-22 01:28:31 +02:00
Santiago Pastorino
5c85822008 Hash#to_param is doesn't use sort anymore, some tests added for Hash#to_param 2010-07-22 06:23:13 +08:00
José Valim
d4151d7f0a Fix a failing test in Railtie and properly define all severity levels in MockLogger for LogSubscriber. 2010-07-20 21:21:14 +02:00
José Valim
9df9c4bac0 Add a test for elapsed and require missing benchmark file. 2010-07-20 17:07:18 +02:00
Kouhei Sutou
a6e95ba554 fix mixed encoding logs can't be logged.
[#4807 state:committed]

Signed-off-by: Kouhei Sutou <kou@cozmixng.org>
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-07-19 14:55:58 -07:00
Aaron Patterson
202fb79e86 reusing the time instrumentation from the instrumenter rather than Benchmark. [#5098 state:open] 2010-07-19 13:44:11 -07:00
Aaron Patterson
1b26c66ce4 mocking out debing? call in the MockLogger 2010-07-19 13:19:28 -07:00
Daniel Guettler
38f0161aab Minor performance improvment in notifications/fanout and active_record/log_subscriber [#5098 state:open] 2010-07-19 11:45:50 -07:00
Aaron Patterson
dd4e81df86 avoid call to Array#first 2010-07-19 10:21:45 -07:00
Łukasz Strzałkowski
fc71d59219 Introduced redefine_method 2010-07-19 23:44:46 +08:00
Aaron Patterson
ad8f4dfc50 avoid proc activation every time a log message is made 2010-07-18 17:37:39 -07:00
Aaron Patterson
8cbb89c0bf subscriber does not need to be a block, but an object that responds to #call 2010-07-18 17:20:20 -07:00
Aaron Patterson
b2c8a5fd3e Notifier API == Fanout API, so replace Notifier with Fanout as they quack the same 2010-07-18 16:49:29 -07:00
Aaron Patterson
234b969946 tap the subscriber for easier return value 2010-07-18 15:39:32 -07:00
Aaron Patterson
2cbef6996c bind method is not needed, so goodbye! <3 <3 <3 2010-07-18 15:37:23 -07:00
Aaron Patterson
cfca55949f convert duration to an attr_reader 2010-07-17 16:03:56 -07:00
Santiago Pastorino
cebe5c2fac It's not needed to initialize the attr when calling mattr_writer 2010-07-18 06:06:58 +08:00
Aaron Patterson
606d8fdfc8 drained? is never called 2010-07-17 14:45:59 -07:00
Aaron Patterson
fa73e777a1 private method is not needed 2010-07-17 14:44:29 -07:00
Aaron Patterson
4226c93779 removing Binding class 2010-07-17 14:35:44 -07:00
Aaron Patterson
9c80f5b391 use === to avoid regular expression creation, and speed up string comparison 2010-07-17 13:14:38 -07:00
wycats
16bae77c56 Revert "Improve performance of MessageVerifier while keeping it constant time"
This reverts commit 8b05c5207dd5757d55d0c384740db289e6bd5415.
2010-07-13 16:13:54 -07:00
Benjamin Quorning
7e075e6247 Fixed many references to the old config/environment.rb and Rails::Initializer 2010-07-13 13:00:21 +02:00
Xavier Noria
2f04c87855 Merge remote branch 'docrails/master' 2010-07-09 22:08:24 +02:00
Jaime Iniesta
c6f4c5916e Minor typos: 'built-in' instead of 'built in', 'built into' instead of 'built in to' 2010-07-09 17:53:47 +02:00
Norman Clarke
6f83a57ac7 Improve bang method defs, make slice! operate in-place. [#5028 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-07-08 22:59:24 +02:00
José Valim
a5dda97602 Define a convention for descendants and subclasses.
The former should be symmetric with ancestors and include all children. However, it should not include self since ancestors + descendants should not have duplicated. The latter is symmetric to superclass in the sense it only includes direct children.

By adopting a convention, we expect to have less conflict with other frameworks, as Datamapper. For this moment, to ensure ActiveModel::Validations can be used with Datamapper, we should always call ActiveSupport::DescendantsTracker.descendants(self) internally instead of self.descendants avoiding conflicts.
2010-07-05 13:01:27 +02:00
Santiago Pastorino
5bf3294c8b Move Date#xmlschema to conversions and add a missing require 2010-07-04 14:10:28 -07:00
Santiago Pastorino
f6d7a4d251 Removes the dependency that AMo has on tzinfo
[#4979 state:committed]
2010-07-03 02:26:18 -03:00
Santiago Pastorino
201f373e7a Refactor move some date, time and date_time methods to */zones and fixed some requires 2010-07-03 02:13:44 -03:00
Santiago Pastorino
8cc746331c Time#formatted_offset is defined in core_ext/time/conversions
[#4979]
2010-07-02 20:22:35 -07:00
Geoff Buesing
227e1caea5 Time#as_json: use Time#formatted_offset instead of strftime %z directive, which is non-standard and inaccurate on some platforms (e.g., Mac OS X).
[#4979]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-07-02 11:50:16 -07:00
Santiago Pastorino
cb321546b7 Time has it own implementation of xmlschema, now AMo doesn't depend on TZInfo
[#4979 state:committed]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-07-02 01:51:03 +02:00
Santiago Pastorino
4a0c514eb4 AS json refactor, move to_json implementation to core_ext and a cleanup a bit the code 2010-07-01 12:04:11 -07:00
José Valim
53b34e8476 Avoid calls to Rails::Application since this is not the official API.
Your application should *always* reference your application const (as Blog::Application) and Rails.application should be used just internally.
2010-07-01 18:43:44 +02:00
Cyril Mougel
9024545a6b fix failure if behavior is not define and try use the default
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-07-01 12:17:21 +02:00
José Valim
e596a8e14c Add the possibility to have several behaviors in AS::Deprecation. 2010-07-01 10:26:45 +02:00
Xavier Noria
c63cf7bf0d Merge remote branch 'rails/master' 2010-06-30 20:47:26 +02:00
bodhi
2eaae1f50b add note of which configuration option to set in deprecation warning message [#5012 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-30 16:58:05 +02:00
José Valim
9ab8cfc21a Improve the idiom used in multibyte chars a bit. 2010-06-30 15:01:23 +02:00
Alex Muntean
265b7c5edf Fix ActiveSupport::Multibyte::Chars#slice for empty strings when starting offset is negative [#4717 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-30 15:00:55 +02:00
Norman Clarke
4dbb6e3ff0 Update Unicode database to 5.2.0. [#5011 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-30 13:22:35 +02:00
James MacAulay
16cef77d37 Fix AS::MB::Chars#+ to not alter self [#4646 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-30 13:22:28 +02:00
Gonçalo Silva
68bd46ffb9 performance tests now working accurately on 1.9, using Ruby with the GCdata patch 2010-06-29 17:12:37 -07:00
wycats
d4c7d3fd94 Create a deprecation behavior that triggers a notification for deprecation notices, and make the behaviors independent of the environment names.
* In Rails 2.3 apps being upgraded, you will need to add the deprecation
  configuration to each of your environments. Failing to do so will
  result in the same behavior as Rails 2.3, but with an outputted warning
  to provide information on how to set up the setting.
* New Rails 3 applications generate the setting
* The notification style will send deprecation notices using
  ActiveSupport::Notifications. Third-party tools can listen in to
  these notifications to provide a streamlined view of the
  deprecation notices occurring in your app.
* The payload in the notification is the deprecation warning itself
  as well as the callstack from the point that triggered the
  notification.
2010-06-29 12:20:15 -07:00
Santiago Pastorino
b2633f9f93 Don't store incorrect values in zones_map
[#4942 state:committed]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-28 19:35:33 +02:00
Thiago Pradi
0175c470c0 Documentation for Array#sample 2010-06-28 13:31:57 -03:00
Santiago Pastorino
6cc29ab65f Implemented getbyte as an aliased method and RDoc added
Signed-off-by: Xavier Noria <fxn@hashref.com>
2010-06-28 01:45:57 +02:00
Santiago Pastorino
cfb38319bc Makes more sense to ask about method_defined?
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-28 01:26:01 +02:00
Santiago Pastorino
a822ce78b3 String#[] doesn't return the byte representation on 1.9.2, we should use getbyte that was already added as a Ruby < 1.9 core_ext
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-27 20:30:29 +02:00
Santiago Pastorino
fa96638bf2 Added getbyte as a core_ext to Ruby < 1.9
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-27 20:30:24 +02:00
Santiago Pastorino
926ca9c102 Load JSON additions (as to_json) on active_support/all.
[#4730 state:committed]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-26 21:15:18 +02:00
Santiago Pastorino
51be8dbded Move constantize from conversions to inflections.
This removes ActiveModel dependency on TZInfo.

[#4979 state:committed]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-26 20:49:30 +02:00
chaitanyav
9958950f78 Add OrderedHash#invert to preserve order in ruby 1.8 [#4875]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-26 12:05:25 +02:00
José Valim
7bd85a8fc2 Work around the fact the JSON gem was overwriting to_json implementation for all Ruby core classes.
This is required because the JSON gem is incompatible with Rails behavior and was not allowing ActiveModel::Errors to be serialized.
So we need to ensure Rails implementation is the one triggered. [#4890 state:resolved]
2010-06-26 12:01:13 +02:00
Norman Clarke
cfaaed3f40 Move some methods into 1.8.x-only proxy. [#4978 state:resolved]
These methods had been overridden because they had bugs on 1.9.1.  Since
Rails now supports only 1.9.2, and these methods now work properly on
that version, there's no longer any need to override them.

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-26 10:16:37 +02:00
rohit
cae33c4158 Remove previously defined class method logger to supress warnings in Active Support test suites. [#4618 state:open]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-26 00:27:31 +02:00
Paul Mucur
158e22dae0 Alias ActiveSupport::OrderedHash#update to ActiveSupport::OrderedHash.merge!
This ensures that an OrderedHash's keys are set up appropriately when using update.

[#4973 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-25 15:02:20 -07:00
Nick Sieger
b549d93d2f AS::Isolation functional on Windows/JRuby.
Doesn't make up for the fact that it's slooooooooow, though.

Signed-off-by: wycats <wycats@gmail.com>
2010-06-24 09:10:58 -07:00
José Valim
6788db824a Move Rails::LogSubscriber to ActiveSupport::LogSubscriber, allowing frameworks like ActiveRecord and ActiveResource to log outsude Rails::Application [#4816 state:resolved] 2010-06-24 13:23:43 +02:00
José Valim
69abbe8934 Avoid using Pathname on Resolver and AS::Dependencies. 2010-06-24 01:06:37 +02:00
Xavier Noria
6f83a5036d renames load_(once_)paths to autoload_(once_)paths in dependencies and config 2010-06-24 00:17:28 +02:00
Prem Sichanugrist
6c4bab306a Missing require for the class/attribute.rb [4812 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-22 17:18:28 +02:00
David Calavera
b8330a2261 preventing memcached initialization errors with default servers list [#4921 state:resolved]
As of this writing the JRuby client does not support a default port.

Signed-off-by: Xavier Noria <fxn@hashref.com>
2010-06-22 16:28:29 +02:00
Josh Kalderimis
fd03f1738e removed default Formatter in logger, not needed with 1.8.7 upwards
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-22 01:19:02 +02:00
Josh Kalderimis
dad71c6099 removed 'unless const_defined?' code smell
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-21 23:34:45 +02:00
rohit
45b263cbf1 Initialize @last_update_at in file_update_checker to hide warnings in AS test suite.
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-21 11:10:19 +02:00
Hongli Lai (Phusion)
756d77622b Allow instrumentation of cache hits and misses. [#4888 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-21 01:09:55 +02:00
Xavier Noria
207fa59675 Merge remote branch 'rails/master'
Conflicts:
	actionpack/lib/abstract_controller/base.rb
2010-06-20 23:13:19 +02:00
Rodrigo Rosenfeld Rosas
03216ae252 Fix comment in en.yml datime_select -> datetime_select 2010-06-20 10:41:47 -03:00
José Valim
dad80ad786 I18n.reload! is only called if any of the locale files actually changed. 2010-06-20 14:44:38 +02:00
José Valim
71703c98ba Add ActiveSupport::FileUpdateChecker. 2010-06-20 13:26:42 +02:00
Norman Clarke
667522ca98 Adds titleize/titlecase to AS::Multibyte::Chars
[#2794 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:51:19 +02:00
rohit
95a8f252c0 remove executable permission from files that don't need it. [#4802 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:50:48 +02:00
Sam Elliott and Santiago Pastorino
02ea1aa88c <=> is defined twice on multibyte/chars.rb for Ruby < 1.9
[#4850 state:committed]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:35:20 +02:00
José Valim
72725d7b7f Merge branch 'master' of github.com:rails/rails 2010-06-20 00:12:54 +02:00
José Valim
d430db9fd4 Remove descendants warning while executing tests. 2010-06-19 17:16:11 +02:00
José Valim
a2b7fcb07c Change callbacks to automatically include DescendantsTracker and rename descendents to descendants. 2010-06-19 16:58:15 +02:00
José Valim
8db8c6f4ce Add ActiveSupport::DescendantsTracker. 2010-06-19 16:44:35 +02:00
Maxime RETY
2c2a5fe829 Fix Yajl backend discovery in ActiveSupport::JSON
[#4897 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-18 20:12:31 -07:00
Gonçalo Silva
113b0ec03c enable_stats added back in since Benchmarker doesn't start RubyProf
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-17 22:15:16 -07:00
Gonçalo Silva
0cef199c8e check if the profiler patch is applied, otherwise GC::Profiler doesn't have the 'data' method 2010-06-17 19:18:53 -07:00
Gonçalo Silva
c8019cd04a added information about what is being used 2010-06-17 19:18:53 -07:00
Gonçalo Silva
b169d83787 heap_live_objects+heap_free_objects is broken, use heap_total_objects instead 2010-06-17 19:18:53 -07:00
Gonçalo Silva
5e5d1babb0 also use GC profiler extended patch to retrieve GC time on 1.9 2010-06-17 19:18:53 -07:00
Gonçalo Silva
f02d3f9eee ruby's GC doesn't support the time method, removed support for it 2010-06-17 19:18:52 -07:00
Gonçalo Silva
175164397b use GC profiler extended patch to retrieve GC runs on 1.9 2010-06-17 19:18:52 -07:00
Gonçalo Silva
555c3b5abe ruby's GC doesn't support collections and heap_info, RubyProf can handle it 2010-06-17 19:18:52 -07:00
Gonçalo Silva
4813462eea GC at 1.9.X doesn't have malloc_allocated_size, remove support for it 2010-06-17 19:18:52 -07:00
Gonçalo Silva
36f5d09692 removed support for 1.8's GC alternative hacks (railsbench and lloyd patches). RubyProf can handle it 2010-06-17 19:18:52 -07:00
Gonçalo Silva
cb74cfc9c1 check if the data method is defined (meaning it's correctly patched) 2010-06-17 19:18:52 -07:00
Gonçalo Silva
901452d06a the official profiler (present in 1.9) should have the highest priority 2010-06-17 19:18:52 -07:00
Gonçalo Silva
381a30fbba don't set cpu_frequency if RubyProf resolved it 2010-06-17 19:18:52 -07:00
Aaron Patterson
5ae7a9d31d when the timezone is nil, a TimeWithZone object should not be constructed. [#4881 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-17 14:14:30 -07:00
Hongli Lai (Phusion)
6f5fb13928 Remove documentation reference to AS::Notifications::Event#result because it has been removed. 2010-06-17 15:47:37 +02:00
Evgeniy Dolzhenko
ef404c771d Fix a bunch of minor spelling mistakes 2010-06-15 12:04:22 +04:00
Xavier Noria
f17159b029 edit pass: the names of Rails components have a space, ie, "Active Record", not "ActiveRecord" 2010-06-14 23:22:04 +02:00
Xavier Noria
94de5b8cb5 edit pass in #define_callbacks rdoc 2010-06-14 22:52:47 +02:00
Neeraj Singh
e4c8bc1b34 adding to the :kind documentation for ActiveSupport callbacks 2010-06-14 16:18:29 -04:00
Neeraj Singh
ed9a183ea4 clearer documentation of how scope applies to ActiveSupport callbacks 2010-06-14 15:48:09 -04:00
Xavier Noria
50df162a2b explains why AS::OrderedHash does not leverage inheritance 2010-06-13 22:02:29 +02:00
Santiago Pastorino
b514b4d696 removes spurious .rb in require
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-13 13:56:08 +02:00
Santiago Pastorino
6d19a4a664 Change implementation to do it without asking each time for block_given?
Signed-off-by: Xavier Noria <fxn@hashref.com>
2010-06-13 07:27:26 +02:00
Xavier Noria
36143d26cb revises implementation of AS::OrderedHash#merge! 2010-06-13 06:37:54 +02:00
Xavier Noria
3359af63a5 Revert "hash merging with a block ignores non-existing keys altogether"
This reverts commit 72f9fec607c4a72b2e88995d0cb32b16b96e9068.

It is wrong, this feature is a little undocumented, doing some research.
2010-06-13 05:53:42 +02:00
Xavier Noria
72f9fec607 hash merging with a block ignores non-existing keys altogether 2010-06-13 05:09:31 +02:00
Paul Mucur
58e21a4a0d Support passing a block to ActiveSupport::OrderedHash's merge and merge! [#4838 state:committed]
For better consistency with Ruby's own Hash implementation.

Signed-off-by: Xavier Noria <fxn@hashref.com>
2010-06-13 04:19:35 +02:00
Santiago Pastorino
f802eb2f00 require conversions to use String#ord 2010-06-12 18:47:37 -07:00
José Valim
1eecd9483b No need to call convert_key before except. 2010-06-12 09:54:18 +02:00
José Valim
50ec0d9b2e Simplify and optimize callbacks superclass sync. 2010-06-12 09:54:18 +02:00
Geoff Buesing
4146a443b6 Date#since, #ago, #beginning_of_day, #end_of_day, #xmlschema return TimeWithZone when Time.zone_default is set
Signed-off-by: Xavier Noria <fxn@hashref.com>
2010-06-12 00:19:12 +02:00
Jeremy Kemper
ed61c3b640 Remove String#constantize deps 2010-06-11 10:33:43 -07:00
Jeremy Kemper
cfc9439454 Explicitly delegate Chars#<=> to work around Kernel#<=> possibly ignoring method_missing 2010-06-11 10:03:23 -07:00
Evgeniy Dolzhenko
ccf9577aee Fix a bunch of minor spelling mistakes 2010-06-11 14:15:34 +04:00
David Heinemeier Hansson
32d4330b81 Get ready for beta 4 2010-06-08 14:47:02 -04:00
wycats
6b49a71ab7 Missing require restored 2010-06-08 14:24:35 -04:00
wycats
068f8d6e85 Require encoding.rb 2010-06-08 14:09:34 -04:00
wycats
8d576b51a1 Move the undef into the 1.9 only branch 2010-06-07 23:32:20 -04:00
wycats
b97a3f33a3 Merge remote branch 'rsim/oracle_enhanced_rails3' 2010-06-07 23:03:59 -04:00
wycats
0042f4166f If we undef <=>, it solves a problem involving comparison. Please figure out the root cause. 2010-06-07 22:31:42 -04:00
Rizwan Reza
3adb395da4 Fixed Load Error failures in 1.9.2-head 2010-06-07 14:53:37 -04:00
Jeremy Kemper
9d0d6f7d26 Clear const references all at once 2010-06-05 22:08:02 -07:00
Jeremy Kemper
fd1a504136 ActiveSupport::Dependencies.constantize shortcut for caching named constant lookups 2010-06-05 22:05:58 -07:00
wycats
a6b3942843 Optimize LookupContext 2010-06-04 20:11:06 -07:00
wycats
16ee4b4d1b Small optimization of 1.9 unescape. We should make sure that inbound ASCII always means UTF-8. It seems so based on a quick survey of common browsers, but let's be sure 2010-06-04 20:11:06 -07:00
wycats
8b05c5207d Improve performance of MessageVerifier while keeping it constant time 2010-06-04 20:11:05 -07:00
wycats
220603ee70 Eliminate the need to check for superclass changes to the callback stack each time through the callbacks 2010-06-04 20:11:05 -07:00
Xavier Noria
67a43554f1 removes Array#random_element and backports Array#sample from Ruby 1.9, thanks to Marc-Andre Lafortune 2010-06-05 01:15:17 +02:00
Raimonds Simanovskis
5fcaf91761 fix conditions when DateTime#to_date and DateTime#xmlschema methods are defined 2010-06-04 22:44:03 +03:00
David Heinemeier Hansson
942fe6514c Merge branch 'master' of github.com:rails/rails 2010-06-02 16:18:03 -05:00
David Heinemeier Hansson
02512914ae You need the ruby-debug available in your Gemfile for debugger to work 2010-06-02 16:17:05 -05:00
Xavier Noria
315e8952df revises the documentation of String#truncate and the truncate helper 2010-06-02 01:35:04 +02:00
David Heinemeier Hansson
cae2519900 Merge branch 'master' of github.com:rails/rails 2010-06-01 16:39:05 -05:00
David Heinemeier Hansson
d57397c4b6 Extracted String#truncate from TextHelper#truncate [DHH] 2010-06-01 16:38:42 -05:00
Santiago Pastorino
57144388f0 Unforce memcache from AS
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-01 10:46:05 +02:00
Santiago Pastorino
31e1445a81 Unforce builder from AS
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-01 10:45:51 +02:00
Santiago Pastorino
0bed93be25 Unforce tzinfo from AS
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-01 09:16:19 +02:00
Santiago Pastorino
1854209bb3 Unforce i18n from AS
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-31 12:56:25 +02:00
Xavier Noria
ddec74fb3a Merge remote branch 'rails/master' 2010-05-27 10:57:05 +02:00
jacortinas
6602fb62a0 A small rdoc change made on lines 39 and 41 on activesupport/lib/active_support/core_ext/object/to_param.rb. It looks like the method name might have been changed, and the comments were never changed to coincide with the new method name. 2010-05-25 19:09:11 +10:00
José Valim
8d5939c096 Fix a bug where I18n fallbacks modules where not included in the proper backend if it was set through config.i18n.backend. 2010-05-23 13:22:19 +02:00