aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4588 from carlosantoniodasilva/remove-require-csrfJosé Valim2012-01-212-9/+0
|\
| * Remove not used requires from csrf helper file and testCarlos Antonio da Silva2012-01-212-9/+0
* | Merge pull request #4575 from carlosantoniodasilva/remove-test-pendingJosé Valim2012-01-213-22/+2
|\ \
| * | 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
| * | 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
| * | 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::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 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::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.Semyon Perepelitsa2012-01-211-2/+3
|/ /
* | Merge pull request #4560 from rafaelfranca/av-number_helper-refactorJosé Valim2012-01-201-52/+34
|\ \
| * | 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
* | 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.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::Errorbrainopia2012-01-206-11/+10
* | | | Merge pull request #4557 from rafaelfranca/av-number_helper-refactorJosé Valim2012-01-202-2/+3
|\ \ \ \
| * | | | No need to check html_safe? twiceRafael Mendonça França2012-01-202-2/+3
| |/ / /
* / / / Revert "just use an alias. The target method is public, so make this one pub...Aaron Patterson2012-01-201-1/+4
|/ / /
* | | Merge pull request #4555 from kennyj/mail_bumpJosé Valim2012-01-201-1/+1
|\ \ \
| * | | Bump mailkennyj2012-01-201-1/+1
|/ / /
* | | Merge pull request #4554 from rodrigoflores/masterJosé Valim2012-01-203-2/+11
|\ \ \
| * | | Added format to percentageRodrigo Flores2012-01-203-2/+11
* | | | Merge pull request #4545 from trotter/fix-documentation-bugVijay Dev2012-01-201-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix documentation bug in Rails::EngineTrotter Cashion2012-01-191-1/+1
* | | | push ivar initialization down to a common methodAaron Patterson2012-01-191-16/+20
* | | | adding tests for previous_changes hashAaron Patterson2012-01-191-0/+25
* | | | just use an alias. The target method is public, so make this one publicAaron Patterson2012-01-191-4/+1
* | | | remove unused capturesAaron Patterson2012-01-191-2/+2
* | | | avoid useless is_a checksAaron Patterson2012-01-191-8/+8