aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Raise exception when date.order includes invalid elementsIndrek Juhkam2012-01-222-1/+17
|
* Merge pull request #4605 from lest/patch-1José Valim2012-01-221-3/+0
|\ | | | | remove obsolete code as old actionmailer api was removed
| * remove obsolete code as old actionmailer api was removedSergey Nartimov2012-01-221-3/+0
| |
* | Support decimal{1,2} and decimal{1-2} and decimal{1.2} so it works fine with ↵José Valim2012-01-222-5/+5
| | | | | | | | | | | | | | | | bash, zsh, etc, closes #4602 Conflicts: railties/test/generators/migration_generator_test.rb
* | Merge pull request #4574 from ihid/masterJosé Valim2012-01-212-0/+17
|\ \ | | | | | | Fixed regression - unable to use a range as choices for form.select.
| * | Fix inconsistent ability to use a range as choices for select_tag.Jeremy Walker2012-01-212-0/+17
| | |
* | | Merge pull request #4599 from jarijokinen/patch-1José Valim2012-01-211-1/+1
|\ \ \ | | | | | | | | Fix typo
| * | | Fix typoJari Jokinen2012-01-221-1/+1
| | | |
* | | | Merge pull request #4592 from jviney/masterJosé Valim2012-01-211-2/+1
|\ \ \ \ | | | | | | | | | | Fix setting $rails_rake_task variable.
| * | | | Fix `$rails_rake_task` global variable warning without replacing the value ↵Jonathan Viney2012-01-221-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | of $rails_rake_task if it is already set. Fixes #4591.
* | | | | Merge pull request #4598 from sachin87/action_mailerJosé Valim2012-01-211-2/+3
|\ \ \ \ \ | |_|/ / / |/| | | | some modifications in action_mailer/base.rb
| * | | | some modifications in action_mailer/base.rbSachin872012-01-221-2/+3
|/ / / /
* | | | uniformizes the punctuation of comments in some files generated for new appsXavier Noria2012-01-228-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 testsJeremy Kemper2012-01-211-82/+79
|/ / /
* | | Merge pull request #4588 from carlosantoniodasilva/remove-require-csrfJosé Valim2012-01-212-9/+0
|\ \ \ | | | | | | | | Remove not used requires from csrf helper file and test
| * | | Remove not used requires from csrf helper file and testCarlos Antonio da Silva2012-01-212-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-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-213-24/+27
|\ \ \ \ | |_|/ / |/| | |
| * | | Revert "Fixed typo in 'cast'."Vijay Dev2012-01-212-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 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)
| * | | Fixed typo in 'cast'.Aleksey Gureiev2012-01-202-6/+6
| | | |
| * | | Merge pull request #78 from trotter/fix-rails-engine-docsBenjamin Manns2012-01-201-1/+1
| |\ \ \ | | | | | | | | | | Fix documentation bug in Rails::Engine
| | * | | Fix documentation bug in Rails::EngineTrotter Cashion2012-01-191-1/+1
| | | | |
| * | | | document `:raise` option support for several helpers [ci skip]Jonathan Roes2012-01-201-0/+3
| | | | |
| * | | | Merge pull request #79 from doriath/masterXavier Noria2012-01-201-19/+19
| |\ \ \ \ | | |/ / / | |/| | | Fix indentation in comment of Delegation module
| | * | | Fix indentation in code example of DelegationTomasz Zurkowski2012-01-201-19/+19
| |/ / /
* | | | Merge pull request #4573 from amatsuda/ar_default_timezone_utcJosé Valim2012-01-212-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::RailtieAkira Matsuda2012-01-212-5/+5
| | | |
* | | | Merge pull request #4572 from semaperepelitsa/noregexpJosé Valim2012-01-211-2/+3
|\ \ \ \ | |/ / / |/| | | Replace regexp matching with a simple string manipulation.
| * | | 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
* | | Merge pull request #4560 from rafaelfranca/av-number_helper-refactorJosé Valim2012-01-201-52/+34
|\ \ \ | | | | | | | | Refactor NumberHelpers
| * | | Refactor translations retrievalRafael Mendonça França2012-01-201-18/+15
| | | |
| * | | Remove code duplicationRafael Mendonça França2012-01-201-34/+19
| | | |
* | | | stop splatting so much. We don't need :star:args everywhereAaron Patterson2012-01-201-7/+6
| | | |
* | | | broadcasting to the console and remove file tailing middlewareAaron Patterson2012-01-201-1/+7
| | | |
* | | | pushed broadcasting down to a moduleAaron Patterson2012-01-203-49/+41
| | | |
* | | | defined the actual logger signatureAaron Patterson2012-01-201-2/+2
| | | |
* | | | restored logging to the log file and display on the consoleAaron Patterson2012-01-201-1/+3
| | | |
* | | | fixed test for more informative messageAaron Patterson2012-01-201-2/+2
| | | |
* | | | made the broadcast logger quack more like a loggerAaron Patterson2012-01-202-15/+59
| | | |
* | | | added the backtrace so errors can be foundAaron Patterson2012-01-201-1/+1
| | | |
* | | | add a broadcasting logger so we can split logsAaron Patterson2012-01-202-0/+80
|/ / /
* | | Fix another race condition.Jon Leighton2012-01-203-3/+11
| | | | | | | | | | | | | | | | | | From 2c667f69aa2daac5ee6c29ca9679616e2a71532a. Thanks @pwnall for the heads-up.
* | | Merge pull request #4528 from j-manu/log-tailer-fixAaron Patterson2012-01-201-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 J2012-01-201-3/+7
| | | |
* | | | Merge pull request #4556 from brainopia/remove_old_cruftAaron Patterson2012-01-206-11/+10
|\ \ \ \ | | | | | | | | | | Removed unused assigns from ActionView::Template::Error
| * | | | Removed unused assigns from ActionView::Template::Errorbrainopia2012-01-206-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | They existed since initial rails commit by DHH but lost use a long time ago