aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4866 from bogdan/terminate_after_callbacksJosé Valim2012-02-042-1/+8
|\ | | | | AS::Callbacks#define_callbacks: add :terminate_after_callbacks option
| * AS::Callbacks: :skip_after_callbacks_if_terminated optionBogdan Gusiev2012-02-032-1/+8
| |
* | Merge pull request #4865 from bogdan/deprecate_per_keyJosé Valim2012-02-031-2/+2
|\ \ | | | | | | AC::Callbacks: remove usage of :per_key option from filters
| * | AC::Callbacks: remove usage of :per_key option from filtersBogdan Gusiev2012-02-031-2/+2
| |/
* | Merge pull request #4863 from norman/unicodeVijay Dev2012-02-031-0/+2
|\ \ | | | | | | Added note about new Unicode version.
| * | Added note about new Unicode version.Norman Clarke2012-02-031-0/+2
| | |
* | | Merge pull request #4862 from norman/unicodeJosé Valim2012-02-033-1/+1
|\| | | | | | | | Update Unicode database to recently-released 6.1.
| * | Update Unicode database to recently-released 6.1.Norman Clarke2012-02-033-1/+1
| |/ | | | | | | http://www.geek.com/articles/geek-pick/unicode-6-1-released-complete-with-emoji-characters-and-a-pile-of-poo-2012022/
* / Verbose output for tests.Arun Agrawal2012-02-031-0/+1
|/ | | | | See #3892
* Merge pull request #3892 from arunagw/verbose_rake_testJosé Valim2012-02-021-1/+0
|\ | | | | No Verbose the output for test.
| * No verbose the output for tests.Arun Agrawal2012-02-011-1/+0
| |
* | Merge pull request #4784 from semaperepelitsa/constantizeAaron Patterson2012-02-011-1/+1
|\ \ | | | | | | A little constantize update
| * | There is an "inherit" option on const_get too, why not use it?Semyon Perepelitsa2012-01-311-1/+1
| | |
* | | revise docs [ci skip]Vijay Dev2012-02-011-1/+1
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-011-0/+14
|\ \ \ | |_|/ |/| |
| * | [ci skip] More docs for ActiveSupport::MessageEncryptorDaniel Fone2012-01-261-0/+14
| | |
* | | Build fix when running isolated testArun Agrawal2012-02-011-0/+1
| | |
* | | Move escaping regexps to constantsCarlos Antonio da Silva2012-02-011-2/+4
| | |
* | | Move escape_once logic to ERB::Util, where it belongs toCarlos Antonio da Silva2012-02-012-0/+17
| | | | | | | | | | | | | | | | | | All the logic is based on the HTML_ESCAPE constant available in ERB::Util, so it seems more logic to have the entire method there and just delegate the helper to use it.
* | | Added as_json method for multibyte stringsDmitriy Vorotilin2012-02-012-0/+7
| |/ |/|
* | merge MRI performance methods into one fileSergey Nartimov2012-01-302-56/+26
| |
* | Replaced all 'for' loops with Enumerable#eachNathan Broadbent2012-01-301-4/+4
| |
* | Inline the prefix assignment so it doesnt look so daftDavid Heinemeier Hansson2012-01-271-2/+1
| |
* | Revert "Fix expanding cache key for single element arrays"David Heinemeier Hansson2012-01-272-16/+8
| | | | | | | | | | | | This reverts commit abe915f23777efe10f17d611bf5718ca855a0704. This broke all existing keys and it's wrong anyway. The array is just there as a convenience option for building the string. It's intentional that [ "stuff"] and "stuff" generates the same key.
* | safe_constantize should handle wrong constant name NameErrors Fixes #4710Alex Tambellini2012-01-262-3/+4
| |
* | global variables may not be set depending on the match. fixes #4703Aaron Patterson2012-01-262-1/+8
| |
* | Add release date of Rails 3.2.0 to documentationclaudiob2012-01-261-1/+1
| |
* | Deprecate DateTime.local_offsetbrainopia2012-01-254-17/+22
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-01-262-8/+8
|\
| * Change ActiveRecord::Errors to ActiveModel::Errors in guidesCarlos Antonio da Silva2012-01-252-8/+8
| | | | | | | | | | | | | | Use ActiveModel::Errors in inflection example docs as well. Also fixes wrong information and link to locale file related to Errors#full_messages in I18n guide.
* | Merge pull request #4646 from lest/patch-1Aaron Patterson2012-01-252-39/+30
|\ \ | | | | | | no need in separate MiniTest modules
| * | no need in separate MiniTest modulesSergey Nartimov2012-01-242-39/+30
| | |
* | | Merge pull request #4524 from nashby/datetime-18-codeJosé Valim2012-01-251-15/+0
|\ \ \ | |/ / |/| | remove ruby 1.8 related code
| * | remove ruby 1.8 related codeVasiliy Ermolovich2012-01-181-15/+0
| | |
* | | Merge pull request #4514 from brainopia/update_timezone_offetsAaron Patterson2012-01-241-1/+1
|\ \ \ | | | | | | | | Update time zone offset information
| * | | Update time zone offset informationbrainopia2012-01-181-1/+1
| |/ /
* | | Fix GH #4344. A defined callback in extended module is called too.kennyj2012-01-242-1/+57
| | |
* | | Merge pull request #4581 from kennyj/remove_unused_argumentAaron Patterson2012-01-231-3/+3
|\ \ \ | | | | | | | | Remove unused argument.
| * | | Remove unused argument.kennyj2012-01-221-3/+3
| | |/ | |/|
* | | Merge pull request #4575 from carlosantoniodasilva/remove-test-pendingJosé Valim2012-01-213-22/+2
|\ \ \ | |/ / |/| | Remove ActiveSupport::TestCase#pending, use `skip` instead
| * | Remove ActiveSupport::TestCase#pending, use `skip` insteadCarlos Antonio da Silva2012-01-213-22/+2
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-01-212-24/+24
|\ \ \ | |/ / |/| |
| * | Why do we even need a constant here? A variable is fine.Semyon Perepelitsa2012-01-211-4/+4
| | |
| * | TaggedLogging wraps an object, not a class.Semyon Perepelitsa2012-01-211-1/+1
| | |
| * | Do not use the same Logger constant for class (from stdlib) and for instance ↵Semyon Perepelitsa2012-01-211-4/+4
| | | | | | | | | | | | (from the example)
| * | Fix indentation in code example of DelegationTomasz Zurkowski2012-01-201-19/+19
| | |
* | | Replace regexp matching with a simple string manipulation.Semyon Perepelitsa2012-01-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using regexp looks like overkill here and is also 2x slower. user system total real string 0.020000 0.000000 0.020000 ( 0.016256) regexp 0.030000 0.000000 0.030000 ( 0.035360) require "benchmark" names = ("a".."z").map { |c| c + "a" * rand(5..10) + "=" * rand(0..1) }.map(&:to_sym) puts names n = 1000 Benchmark.bmbm do |x| x.report "string" do n.times do names.each do |name| string_name = name.to_s string_name.chomp!('=') string_name end end end x.report "regexp" do n.times do names.each do |name| name.to_s =~ /(.*)=$/ $1 end end end end
* | | pushed broadcasting down to a moduleAaron Patterson2012-01-202-47/+40
| | |
* | | defined the actual logger signatureAaron Patterson2012-01-201-2/+2
| | |
* | | fixed test for more informative messageAaron Patterson2012-01-201-2/+2
| | |