Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4866 from bogdan/terminate_after_callbacks | José Valim | 2012-02-04 | 2 | -1/+8 |
|\ | | | | | AS::Callbacks#define_callbacks: add :terminate_after_callbacks option | ||||
| * | AS::Callbacks: :skip_after_callbacks_if_terminated option | Bogdan Gusiev | 2012-02-03 | 2 | -1/+8 |
| | | |||||
* | | Merge pull request #4865 from bogdan/deprecate_per_key | José Valim | 2012-02-03 | 1 | -2/+2 |
|\ \ | | | | | | | AC::Callbacks: remove usage of :per_key option from filters | ||||
| * | | AC::Callbacks: remove usage of :per_key option from filters | Bogdan Gusiev | 2012-02-03 | 1 | -2/+2 |
| |/ | |||||
* | | Merge pull request #4863 from norman/unicode | Vijay Dev | 2012-02-03 | 1 | -0/+2 |
|\ \ | | | | | | | Added note about new Unicode version. | ||||
| * | | Added note about new Unicode version. | Norman Clarke | 2012-02-03 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #4862 from norman/unicode | José Valim | 2012-02-03 | 3 | -1/+1 |
|\| | | | | | | | | Update Unicode database to recently-released 6.1. | ||||
| * | | Update Unicode database to recently-released 6.1. | Norman Clarke | 2012-02-03 | 3 | -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 Agrawal | 2012-02-03 | 1 | -0/+1 |
|/ | | | | | See #3892 | ||||
* | Merge pull request #3892 from arunagw/verbose_rake_test | José Valim | 2012-02-02 | 1 | -1/+0 |
|\ | | | | | No Verbose the output for test. | ||||
| * | No verbose the output for tests. | Arun Agrawal | 2012-02-01 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #4784 from semaperepelitsa/constantize | Aaron Patterson | 2012-02-01 | 1 | -1/+1 |
|\ \ | | | | | | | A little constantize update | ||||
| * | | There is an "inherit" option on const_get too, why not use it? | Semyon Perepelitsa | 2012-01-31 | 1 | -1/+1 |
| | | | |||||
* | | | revise docs [ci skip] | Vijay Dev | 2012-02-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-01 | 1 | -0/+14 |
|\ \ \ | |_|/ |/| | | |||||
| * | | [ci skip] More docs for ActiveSupport::MessageEncryptor | Daniel Fone | 2012-01-26 | 1 | -0/+14 |
| | | | |||||
* | | | Build fix when running isolated test | Arun Agrawal | 2012-02-01 | 1 | -0/+1 |
| | | | |||||
* | | | Move escaping regexps to constants | Carlos Antonio da Silva | 2012-02-01 | 1 | -2/+4 |
| | | | |||||
* | | | Move escape_once logic to ERB::Util, where it belongs to | Carlos Antonio da Silva | 2012-02-01 | 2 | -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 strings | Dmitriy Vorotilin | 2012-02-01 | 2 | -0/+7 |
| |/ |/| | |||||
* | | merge MRI performance methods into one file | Sergey Nartimov | 2012-01-30 | 2 | -56/+26 |
| | | |||||
* | | Replaced all 'for' loops with Enumerable#each | Nathan Broadbent | 2012-01-30 | 1 | -4/+4 |
| | | |||||
* | | Inline the prefix assignment so it doesnt look so daft | David Heinemeier Hansson | 2012-01-27 | 1 | -2/+1 |
| | | |||||
* | | Revert "Fix expanding cache key for single element arrays" | David Heinemeier Hansson | 2012-01-27 | 2 | -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 #4710 | Alex Tambellini | 2012-01-26 | 2 | -3/+4 |
| | | |||||
* | | global variables may not be set depending on the match. fixes #4703 | Aaron Patterson | 2012-01-26 | 2 | -1/+8 |
| | | |||||
* | | Add release date of Rails 3.2.0 to documentation | claudiob | 2012-01-26 | 1 | -1/+1 |
| | | |||||
* | | Deprecate DateTime.local_offset | brainopia | 2012-01-25 | 4 | -17/+22 |
|/ | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-01-26 | 2 | -8/+8 |
|\ | |||||
| * | Change ActiveRecord::Errors to ActiveModel::Errors in guides | Carlos Antonio da Silva | 2012-01-25 | 2 | -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-1 | Aaron Patterson | 2012-01-25 | 2 | -39/+30 |
|\ \ | | | | | | | no need in separate MiniTest modules | ||||
| * | | no need in separate MiniTest modules | Sergey Nartimov | 2012-01-24 | 2 | -39/+30 |
| | | | |||||
* | | | Merge pull request #4524 from nashby/datetime-18-code | José Valim | 2012-01-25 | 1 | -15/+0 |
|\ \ \ | |/ / |/| | | remove ruby 1.8 related code | ||||
| * | | remove ruby 1.8 related code | Vasiliy Ermolovich | 2012-01-18 | 1 | -15/+0 |
| | | | |||||
* | | | Merge pull request #4514 from brainopia/update_timezone_offets | Aaron Patterson | 2012-01-24 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Update time zone offset information | ||||
| * | | | Update time zone offset information | brainopia | 2012-01-18 | 1 | -1/+1 |
| |/ / | |||||
* | | | Fix GH #4344. A defined callback in extended module is called too. | kennyj | 2012-01-24 | 2 | -1/+57 |
| | | | |||||
* | | | Merge pull request #4581 from kennyj/remove_unused_argument | Aaron Patterson | 2012-01-23 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | Remove unused argument. | ||||
| * | | | Remove unused argument. | kennyj | 2012-01-22 | 1 | -3/+3 |
| | |/ | |/| | |||||
* | | | Merge pull request #4575 from carlosantoniodasilva/remove-test-pending | José Valim | 2012-01-21 | 3 | -22/+2 |
|\ \ \ | |/ / |/| | | Remove ActiveSupport::TestCase#pending, use `skip` instead | ||||
| * | | Remove ActiveSupport::TestCase#pending, use `skip` instead | Carlos Antonio da Silva | 2012-01-21 | 3 | -22/+2 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-01-21 | 2 | -24/+24 |
|\ \ \ | |/ / |/| | | |||||
| * | | Why do we even need a constant here? A variable is fine. | Semyon Perepelitsa | 2012-01-21 | 1 | -4/+4 |
| | | | |||||
| * | | TaggedLogging wraps an object, not a class. | Semyon Perepelitsa | 2012-01-21 | 1 | -1/+1 |
| | | | |||||
| * | | Do not use the same Logger constant for class (from stdlib) and for instance ↵ | Semyon Perepelitsa | 2012-01-21 | 1 | -4/+4 |
| | | | | | | | | | | | | (from the example) | ||||
| * | | Fix indentation in code example of Delegation | Tomasz Zurkowski | 2012-01-20 | 1 | -19/+19 |
| | | | |||||
* | | | Replace regexp matching with a simple string manipulation. | Semyon Perepelitsa | 2012-01-21 | 1 | -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 module | Aaron Patterson | 2012-01-20 | 2 | -47/+40 |
| | | | |||||
* | | | defined the actual logger signature | Aaron Patterson | 2012-01-20 | 1 | -2/+2 |
| | | | |||||
* | | | fixed test for more informative message | Aaron Patterson | 2012-01-20 | 1 | -2/+2 |
| | | |