| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | | Fix inconsistent ability to use a range as choices for select_tag. | Jeremy Walker | 2012-01-21 | 2 | -0/+17 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #4599 from jarijokinen/patch-1 | José Valim | 2012-01-21 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo | |||||
| | * | | | | | | | | | | | Fix typo | Jari Jokinen | 2012-01-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #4592 from jviney/master | José Valim | 2012-01-21 | 1 | -2/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix setting $rails_rake_task variable. | |||||
| | * | | | | | | | | | | | | Fix `$rails_rake_task` global variable warning without replacing the value ↵ | Jonathan Viney | 2012-01-22 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of $rails_rake_task if it is already set. Fixes #4591. | |||||
| * | | | | | | | | | | | | | Merge pull request #4598 from sachin87/action_mailer | José Valim | 2012-01-21 | 1 | -2/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | some modifications in action_mailer/base.rb | |||||
| | * | | | | | | | | | | | | some modifications in action_mailer/base.rb | Sachin87 | 2012-01-22 | 1 | -2/+3 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | uniformizes the punctuation of comments in some files generated for new apps | Xavier Noria | 2012-01-22 | 8 | -82/+82 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some end with a full stop, some don't. Let's have attention to detail and make them uniform. I have chosen to add full stops according to our documentation guidelines related to RDoc. | |||||
| * | | | | | | | | | | | | Split Basic and Digest authorization tests | Jeremy Kemper | 2012-01-21 | 1 | -82/+79 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge pull request #4588 from carlosantoniodasilva/remove-require-csrf | José Valim | 2012-01-21 | 2 | -9/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove not used requires from csrf helper file and test | |||||
| | * | | | | | | | | | | | Remove not used requires from csrf helper file and test | Carlos Antonio da Silva | 2012-01-21 | 2 | -9/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These requires were added in a87b92d and the implementation changed in 2cdc1f0, removing the need for them. | |||||
| * | | | | | | | | | | | | 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 | 3 | -24/+27 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Revert "Fixed typo in 'cast'." | Vijay Dev | 2012-01-21 | 2 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ecac7c96451ee8d85ca602c9ce3416a5e7ef6a03. Reason: Changelogs are not meant to be changed from docrails. | |||||
| | * | | | | | | | | | | 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) | |||||
| | * | | | | | | | | | | Fixed typo in 'cast'. | Aleksey Gureiev | 2012-01-20 | 2 | -6/+6 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge pull request #78 from trotter/fix-rails-engine-docs | Benjamin Manns | 2012-01-20 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix documentation bug in Rails::Engine | |||||
| | | * | | | | | | | | | | Fix documentation bug in Rails::Engine | Trotter Cashion | 2012-01-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | document `:raise` option support for several helpers [ci skip] | Jonathan Roes | 2012-01-20 | 1 | -0/+3 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Merge pull request #79 from doriath/master | Xavier Noria | 2012-01-20 | 1 | -19/+19 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | Fix indentation in comment of Delegation module | |||||
| | | * | | | | | | | | | | Fix indentation in code example of Delegation | Tomasz Zurkowski | 2012-01-20 | 1 | -19/+19 | |
| | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge pull request #4573 from amatsuda/ar_default_timezone_utc | José Valim | 2012-01-21 | 2 | -5/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | change AR default_timezone to :utc since it's the default for AR::Railtie | |||||
| | * | | | | | | | | | | change AR default_timezone to :utc since it's the default for AR::Railtie | Akira Matsuda | 2012-01-21 | 2 | -5/+5 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #4572 from semaperepelitsa/noregexp | José Valim | 2012-01-21 | 1 | -2/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | Replace regexp matching with a simple string manipulation. | |||||
| | * | | | | | | | | | | 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 | |||||
| * | | | | | | | | | | Merge pull request #4560 from rafaelfranca/av-number_helper-refactor | José Valim | 2012-01-20 | 1 | -52/+34 | |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | Refactor NumberHelpers | |||||
| | * | | | | | | | | | Refactor translations retrieval | Rafael Mendonça França | 2012-01-20 | 1 | -18/+15 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Remove code duplication | Rafael Mendonça França | 2012-01-20 | 1 | -34/+19 | |
| | | |_|_|/ / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | | stop splatting so much. We don't need :star:args everywhere | Aaron Patterson | 2012-01-20 | 1 | -7/+6 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | broadcasting to the console and remove file tailing middleware | Aaron Patterson | 2012-01-20 | 1 | -1/+7 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | pushed broadcasting down to a module | Aaron Patterson | 2012-01-20 | 3 | -49/+41 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | defined the actual logger signature | Aaron Patterson | 2012-01-20 | 1 | -2/+2 | |
| | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | | restored logging to the log file and display on the console | Aaron Patterson | 2012-01-20 | 1 | -1/+3 | |
| | | | | | | | | | ||||||
| * | | | | | | | | fixed test for more informative message | Aaron Patterson | 2012-01-20 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | made the broadcast logger quack more like a logger | Aaron Patterson | 2012-01-20 | 2 | -15/+59 | |
| | | | | | | | | | ||||||
| * | | | | | | | | added the backtrace so errors can be found | Aaron Patterson | 2012-01-20 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | add a broadcasting logger so we can split logs | Aaron Patterson | 2012-01-20 | 2 | -0/+80 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Fix another race condition. | Jon Leighton | 2012-01-20 | 3 | -3/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From 2c667f69aa2daac5ee6c29ca9679616e2a71532a. Thanks @pwnall for the heads-up. | |||||
| * | | | | | | | Merge pull request #4528 from j-manu/log-tailer-fix | Aaron Patterson | 2012-01-20 | 1 | -3/+7 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix for log tailer when the log file doesn't exist. | |||||
| | * | | | | | | | Fix for log tailer when the log file doesn't exist. | Manu J | 2012-01-20 | 1 | -3/+7 | |
| | | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | | Merge pull request #4556 from brainopia/remove_old_cruft | Aaron Patterson | 2012-01-20 | 6 | -11/+10 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Removed unused assigns from ActionView::Template::Error | |||||
| | * | | | | | | | Removed unused assigns from ActionView::Template::Error | brainopia | 2012-01-20 | 6 | -11/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They existed since initial rails commit by DHH but lost use a long time ago | |||||
| * | | | | | | | | Merge pull request #4557 from rafaelfranca/av-number_helper-refactor | José Valim | 2012-01-20 | 2 | -2/+3 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | No need to check html_safe? twice at number_to_percentage | |||||
| | * | | | | | | | | No need to check html_safe? twice | Rafael Mendonça França | 2012-01-20 | 2 | -2/+3 | |
| | |/ / / / / / / | ||||||
| * / / / / / / / | Revert "just use an alias. The target method is public, so make this one ↵ | Aaron Patterson | 2012-01-20 | 1 | -1/+4 | |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | public" This reverts commit be7d2248e9505983d1aacf0b33c657e6e3ddd9db. | |||||
| * | | | | | | | Merge pull request #4555 from kennyj/mail_bump | José Valim | 2012-01-20 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Bump mail 2.4.1 | |||||
| | * | | | | | | | Bump mail | kennyj | 2012-01-20 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |