aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Ruby 1.8 doesn't have to_r defined to NilClass and Float.Rafael Mendonça França2012-08-181-5/+14
* Merge pull request #7352 from aripollak/microsecond-timestampRafael Mendonça França2012-08-174-3/+10
* Increase benchmark time to 20 seconds.Jon Leighton2012-08-171-18/+18
* Use benchmark/ips to measure AR performanceJon Leighton2012-08-172-39/+36
* Remove duplicated changelog entry [ci skip]Carlos Antonio da Silva2012-08-151-6/+0
* Merge pull request #7027 from erichmenge/patch/jruby_send_fileCarlos Antonio da Silva2012-08-152-2/+28
|\
| * Backport 5c51cd0: #send_file leans on Rack::Sendfile to X-Accel-Redirect the ...Jeremy Kemper2012-08-152-2/+28
* | Do not use update_column where update_attribute is not interchangeableRafael Mendonça França2012-08-158-39/+32
|/
* Merge pull request #6073 from daveyeu/restore-state-on-record-invalidRafael Mendonça França2012-08-113-1/+23
* Merge pull request #7316 from brainopia/backport_fix_session_store_optionsRafael Mendonça França2012-08-115-5/+38
|\
| * Update changelog to reflect support of cookie jar options for allbrainopia2012-08-111-0/+5
| * Test actual content of permanent cookiebrainopia2012-08-101-1/+1
| * Dont stream back cookie value if it was set to the same valuebrainopia2012-08-102-5/+19
| * Revert "Revert "Merge pull request #6084 from brainopia/support_for_magic_dom...brainopia2012-08-102-0/+14
* | [guides] Add info about CHANGELOGs to contributing guidePiotr Sarnacki2012-08-111-0/+25
* | Add CHANGELOG entry for #7286Rafael Mendonça França2012-08-101-0/+5
* | Merge pull request #7286 from kennyj/fix_7191Rafael Mendonça França2012-08-102-13/+28
|/
* Merge pull request #7309 from amerine/3-2-stableSantiago Pastorino2012-08-091-0/+2
|\
| * Add html_escape note to CHANGELOGMark Turner2012-08-091-0/+2
|/
* Merge branch '3-2-8' into 3-2-stableSantiago Pastorino2012-08-0920-21/+49
|\
| * Bump to 3.2.8Santiago Pastorino2012-08-099-9/+9
| * Add release date to CHANGELOGsSantiago Pastorino2012-08-097-7/+7
| * Do not mark strip_tags result as html_safeSantiago Pastorino2012-08-093-3/+10
| * escape select_tag :prompt valuesSantiago Pastorino2012-08-093-2/+15
| * Bump to 3.2.8.rc2Santiago Pastorino2012-08-039-9/+9
| * Add CHANGELOG entrySantiago Pastorino2012-08-031-0/+2
| * More `:rails_env` cleanup.Rafael Mendonça França2012-08-021-6/+6
| * Fix html_escape with Ruby 1.8Rafael Mendonça França2012-08-021-15/+26
| * html_escape should escape single quotesSantiago Pastorino2012-08-0212-63/+51
| * Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` atRafael Mendonça França2012-08-022-4/+9
| * Do not consider the numeric attribute as changed if the old value isRafael Mendonça França2012-08-023-2/+21
| * Fix ActiveSupport integration with Mocha > 0.12.1Mike Gunderloy2012-08-021-1/+3
* | Merge pull request #7299 from iHiD/3-2-stable-storeRafael Mendonça França2012-08-095-2/+22
|\ \
| * | Add CHANGELOG entryRafael Mendonça França2012-08-091-0/+5
| * | Backport #7173.Jeremy Walker2012-08-091-2/+4
| * | Ported PR #4856 to 3-2-stable.Jeremy Walker2012-08-094-2/+15
|/ /
* | Fix CHANGELOG [ci skip]Rafael Mendonça França2012-08-081-1/+4
* | Remove references to old behavior with headers atRafael Mendonça França2012-08-071-4/+3
* | Merge pull request #7284 from josh/fix-asset-testsRafael Mendonça França2012-08-071-3/+2
|\ \
| * | Fix invalid asset compile assertionsJoshua Peek2012-08-071-3/+2
|/ /
* | make assertions easier to track downAaron Patterson2012-08-071-9/+17
* | Merge pull request #7283 from josh/bump-sprocketsDavid Heinemeier Hansson2012-08-071-1/+1
|\ \
| * | Loosen sprockets version restrictionJoshua Peek2012-08-071-1/+1
|/ /
* | Add CHANGELOG entry for a935c7aRafael Mendonça França2012-08-061-0/+5
* | Merge pull request #5872 from evtuhovich/prepared_statement_fixAaron Patterson2012-08-061-10/+10
* | Merge pull request #7167 from route/missed_extendJosé Valim2012-08-061-0/+1
* | Merge pull request #7276 from sikachu/3-2-stable-js-include-tag-fixRafael Mendonça França2012-08-063-7/+19
|\ \
| * | Rearrange example output of javascript_include_tagPrem Sichanugrist2012-08-061-2/+2
| * | Do not include application.js if it doesn't existsPrem Sichanugrist2012-08-063-5/+17
|/ /
* | Merge pull request #7140 from seamusabshere/patch-1Rafael Mendonça França2012-08-052-2/+10
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 08:45:41 +0000