aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Preparing for 4.2.0.beta1 releaseDavid Heinemeier Hansson2014-08-1910-10/+10
* Extra spaceDavid Heinemeier Hansson2014-08-191-1/+0
* Merge pull request #16571 from lucasmazza/lm-fix-actionmailer-test-caseRafael Mendonça França2014-08-191-0/+9
|\
| * Add `set_delivery_method` and `restore_delivery_method` to `ActionMailer::Tes...Lucas Mazza2014-08-191-0/+9
|/
* Create a group to active job gemsRafael Mendonça França2014-08-191-11/+13
* Copy & paste fail [ci skip]Godfrey Chan2014-08-191-1/+1
* :nail_care: The note doesn't look good on the blue background [ci skip]Godfrey Chan2014-08-191-2/+2
* :bomb: oops, it should be 4.2 that's WIP [ci skip]Godfrey Chan2014-08-192-5/+4
* Some placeholders for the 4.2 upgrade guide [ci skip]Godfrey Chan2014-08-191-0/+16
* Clearly mark these as WIP, and invite people to contribute. [ci skip]Godfrey Chan2014-08-192-1/+6
* List the 4.2 release notes in the index, mark it as WIP [ci skip]Godfrey Chan2014-08-191-0/+5
* Major features in 4.2 release notes [ci skip]Godfrey Chan2014-08-191-0/+40
* Fix failing railties testsCarlos Antonio da Silva2014-08-191-2/+6
* Fix blank link on config/application.rb app template [ci skip]Carlos Antonio da Silva2014-08-191-1/+1
* Synced AR release notes [ci-skip]Godfrey Chan2014-08-191-0/+18
* Merge pull request #16570 from bradleybuda/breach-mitigation-mask-csrf-tokenJeremy Kemper2014-08-192-8/+71
|\
| * Auth token mask from breach-mitigation-rails gemBradley Buda2014-08-192-8/+71
* | Synced Active Support release notes [ci skip]Godfrey Chan2014-08-191-0/+21
* | Use the released turbolinks gemCarlos Antonio da Silva2014-08-191-3/+1
* | Fix setting simple values to the new config.xCarlos Antonio da Silva2014-08-194-13/+24
* | Point to right sass-rails versionRafael Mendonça França2014-08-191-1/+1
* | Synced Active Model changelogs [ci skip]Godfrey Chan2014-08-191-4/+16
* | Use web-console 2.0.0.beta2 on new appsGuillermo Iguaran2014-08-191-1/+1
* | Require sprockets-rails 3.0.0.beta1Rafael Mendonça França2014-08-192-2/+1
* | Revert "Improve custom configuration"Rafael Mendonça França2014-08-198-145/+46
* | Require rack/utilsRafael Mendonça França2014-08-191-0/+2
* | Merge pull request #16561 from gsamokovarov/mention-web-console-in-changelogGuillermo Iguaran2014-08-192-0/+10
|\ \
| * | Mention web-console in 4.2 release notesGenadi Samokovarov2014-08-202-0/+10
* | | Merge pull request #16475 from tomkadwill/has_many_scope_documentationZachary Scott2014-08-191-0/+11
|\ \ \
| * | | [ci skip] Added documentation for belongs_to scope parameterTom Kadwill2014-08-191-0/+11
* | | | We always get the value so no need to check nil or HashRafael Mendonça França2014-08-191-6/+2
* | | | Move date and time requires to time_travel_test, also includeZachary Scott2014-08-192-2/+4
* | | | Add TODO note about the gems missing releaseRafael Mendonça França2014-08-191-1/+3
* | | | Remove git dependeciesRafael Mendonça França2014-08-191-2/+0
* | | | Use released rails-html-sanitizerRafael Mendonça França2014-08-192-2/+2
* | | | Use released rails-deprecated_sanitizerRafael Mendonça França2014-08-193-3/+2
* | | | Bump ActiveJob's GlobalID dep to 0.2.3+ to fix Railties testsJeremy Kemper2014-08-191-1/+1
* | | | Merge pull request #16564 from zzak/move_time_travel_testJeremy Kemper2014-08-192-69/+68
|\ \ \ \
| * | | | Move TimeHelperTest to TimeTravelTest from `as/test_test.rb`Zachary Scott2014-08-192-69/+68
* | | | | Fix the rails-dom-testing dependecyRafael Mendonça França2014-08-193-1/+3
* | | | | Merge pull request #16563 from arthurnn/add_ar_raise_trans_optionRafael Mendonça França2014-08-191-0/+5
|\ \ \ \ \
| * | | | | Add default .raise_in_transactional_callbacks option to templateArthur Neves2014-08-191-0/+5
* | | | | | loofah require dependecy is not needed anymoreRafael Mendonça França2014-08-192-4/+0
* | | | | | Merge pull request #16349 from jmcnevin/masterRafael Mendonça França2014-08-192-9/+23
|\ \ \ \ \ \
| * | | | | | Correctly determine if migration is needed.Jeremy McNevin2014-08-132-9/+23
* | | | | | | Merge pull request #16536 from rails/improve-custom-configurationRafael Mendonça França2014-08-198-46/+149
|\ \ \ \ \ \ \
| * | | | | | | Improve custom configurationRafael Mendonça França2014-08-198-46/+149
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Protect against error when parsing parameters with Bad RequestRafael Mendonça França2014-08-193-2/+30
* | | | | | | Merge pull request #16299 from sikachu/ps-safer-ac-paramsJeremy Kemper2014-08-195-39/+382
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | User `#to_hash` instead of calling `super`Prem Sichanugrist2014-08-181-1/+1