aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Get ready to release 4.1.0.beta1David Heinemeier Hansson2013-12-177-7/+7
* Remove the navigator for now. Its ugly and it promises more than it can deliv...David Heinemeier Hansson2013-12-171-6/+1
* Clearly limit new CSRF protection to GET requestsJeremy Kemper2013-12-172-2/+17
* Mention new CSRF protection gotcha in upgrade guideJeremy Kemper2013-12-171-1/+26
* Discuss Action Pack's new CSRF protection from remote script tags and what it...Jeremy Kemper2013-12-171-132/+146
* Fix integration test to pass same-origin verificationJeremy Kemper2013-12-171-1/+1
* Merge pull request #13345 from jeremy/get-csrfJeremy Kemper2013-12-176-28/+143
|\
| * CSRF protection from cross-origin <script> tagsJeremy Kemper2013-12-176-28/+143
* | Merge pull request #13314 from laurocaetano/blacklist_array_methodsJeremy Kemper2013-12-174-30/+59
|\ \
| * | Create a blacklist to disallow mutator methods to be delegated to `Array`.Lauro Caetano2013-12-174-30/+59
* | | Add changelog entries about secrets.yml and secrets.secret_key_baseGuillermo Iguaran2013-12-171-0/+29
* | | Merge pull request #13346 from chancancode/release_notes_etcYves Senn2013-12-174-47/+147
|\ \ \
| * | | Some assorted fixes for the 4.1 release notes:Godfrey Chan2013-12-174-47/+147
| |/ /
* | | Merge pull request #13341 from carlosantoniodasilva/ca-i18nCarlos Antonio da Silva2013-12-1710-14/+94
|\ \ \ | |/ / |/| |
| * | Require I18n >= 0.6.9Carlos Antonio da Silva2013-12-171-1/+1
| * | Add changelog and upgrading notice related to I18n enforce_available_locales ...Carlos Antonio da Silva2013-12-172-5/+30
| * | Disable available locales checks to avoid warnings running the testsCarlos Antonio da Silva2013-12-175-0/+15
| * | Default I18n.enforce_available_locales to trueCarlos Antonio da Silva2013-12-172-8/+48
* | | concern doesn't include the module automaticallyRafael Mendonça França2013-12-171-1/+0
* | | Merge pull request #13343 from akshay-vishnoi/test-casesRafael Mendonça França2013-12-171-0/+4
|\ \ \
| * | | test case for #limit added - picking latest value from limitAkshay Vishnoi2013-12-171-0/+4
* | | | release notes link to fixed versions of the API. [ci skip]Yves Senn2013-12-172-2/+2
| |/ / |/| |
* | | Fix indent on AS changelog [ci skip]Carlos Antonio da Silva2013-12-171-18/+18
* | | minor doc reword. Upgrade Rails itself not to Rails. [ci skip]Yves Senn2013-12-171-3/+3
| |/ |/|
* | Merge pull request #13347 from jeremy/concerningJeremy Kemper2013-12-174-0/+219
|\ \
| * | Introduce Module#concerningJeremy Kemper2013-12-174-0/+219
|/ /
* | MySQL: remove the old-school 'packets out of order' messageJeremy Kemper2013-12-171-6/+0
* | use `bin/spring` in release notes. [ci skip]Yves Senn2013-12-171-1/+1
* | Merge pull request #13332 from rails/pixeltrix/mail_viewGuillermo Iguaran2013-12-1621-26/+765
|\ \
| * | Add mailer previews feature based on mail_view gemAndrew White2013-12-1717-6/+736
| * | Add an application controller for internal controllersAndrew White2013-12-173-18/+23
| * | Fix method redefinition warningAndrew White2013-12-171-2/+6
|/ /
* | Merge pull request #12873 from martinemde/fix-where-assoc-nilCarlos Antonio da Silva2013-12-163-3/+104
|\ \ | |/ |/|
| * Better support for `where()` conditions that use an association name.Martin Emde2013-12-163-3/+104
|/
* Remove the link for code.whytheluckystiff.netRafael Mendonça França2013-12-161-1/+1
* Merge pull request #13338 from shreve/patch-1Rafael Mendonça França2013-12-161-1/+1
|\
| * Fix url leak in application templates guideJacob Evan Shreve2013-12-161-1/+1
|/
* Merge pull request #13321 from mezis/fix-safebuffer-interpolation-masterJeremy Kemper2013-12-162-7/+37
|\
| * Fixes interpolation on SafeBufferJulien Letessier2013-12-142-7/+37
* | Fix missing closing rdoc tag [ci skip]Carlos Antonio da Silva2013-12-161-1/+1
* | Merge pull request #13328 from teohm/dbconsole_support_database_urlYves Senn2013-12-163-35/+76
|\ \
| * | fixed rails dbconsole to support ENV['DATABASE_URL'].Huiming Teo2013-12-163-35/+76
* | | Merge pull request #13333 from kia84/masterYves Senn2013-12-151-0/+1
|\ \ \
| * | | Added `absence` parameter to pluralization tableIvan2013-12-161-0/+1
|/ / /
* | | Merge pull request #13307 from akshay-vishnoi/typoRafael Mendonça França2013-12-154-6/+6
|\ \ \
| * | | Spelling and Grammar check [ci skip]Akshay Vishnoi2013-12-164-6/+6
* | | | Improve CHANGELOG entry with examples [ci skip]Rafael Mendonça França2013-12-151-0/+10
* | | | Merge pull request #13313 from ccutrer/temp-tablesRafael Mendonça França2013-12-158-17/+83
|\ \ \ \
| * | | | support creating temporary tables from queriesCody Cutrer2013-12-148-17/+83
* | | | | Improve the CHANGELOG entry [ci skip]Rafael Mendonça França2013-12-151-3/+3