aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13340 from akshay-vishnoi/typoGodfrey Chan2013-12-181-5/+4
|\
| * #none documentation updated [ci skip]Akshay Vishnoi2013-12-181-5/+4
* | Use annotated git tags for release taskJeremy Kemper2013-12-182-2/+2
* | we should use annotated tags for releases.Yves Senn2013-12-182-2/+2
* | Merge pull request #13363 from kuldeepaggarwal/f-video-optionsGuillermo Iguaran2013-12-172-5/+11
|\ \
| * | allow video_tag to accept `size` as `Number` for square shaped videosKuldeep Aggarwal2013-12-182-5/+11
* | | Merge pull request #13364 from corprew/patch-1Arun Agrawal2013-12-171-1/+1
|\ \ \
| * | | typo: should be 'DateTime.civil_from_format' and not 'DateTime.civil_from_fro...Corprew Reed2013-12-171-1/+1
|/ / /
* | | Add a failing test for assigning nil to a polymorphic belongs_to not nullifyi...Jeremy Kemper2013-12-171-0/+13
* | | Merge pull request #13358 from JuanitoFatas/patch/release-notesCarlos Antonio da Silva2013-12-171-7/+9
|\ \ \
| * | | [ci skip] Prettify the removals from Action Controller in 4.1 release notes.Juanito Fatas2013-12-181-7/+9
|/ / /
* | | Its beta1 all aroundDavid Heinemeier Hansson2013-12-172-2/+2
* | | Fix dependency orderDavid Heinemeier Hansson2013-12-171-1/+1
* | | 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
|/ /