aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* allow context type when set body mailMQuy2016-11-302-4/+13
* Prevent race condition when launching EventMachine reactorMatthew Draper2016-11-302-2/+28
* Avoid race condition in AJ integration testsMatthew Draper2016-11-302-1/+3
* Merge pull request #27221 from phoet/current_is_not_usedMatthew Draper2016-11-301-1/+0
|\
| * removed `@current` as it is not usedphoet2016-11-301-1/+0
* | Merge pull request #27220 from mrreynolds/patch-1Kasper Timm Hansen2016-11-301-1/+1
|\ \ | |/ |/|
| * fix typo in changelogRobert Glaser2016-11-301-1/+1
|/
* Missing require 'active_support/notifications'Akira Matsuda2016-11-301-0/+1
* Merge pull request #27217 from roryokane/patch-1Rafael França2016-11-291-1/+1
|\
| * Fix typo in Rails 5.0 release notes – “when when”Rory O’Kane2016-11-291-1/+1
|/
* Merge pull request #27212 from dcarral/docs-action-on-unpermitted-parameters ...Sean Griffin2016-11-291-2/+2
|\
| * Document 'false' as option for 'action_on_unpermitted_parameters'Daniel Carral2016-11-291-2/+2
* | Treat combined durations as a single unitSean Griffin2016-11-292-3/+20
|/
* Merge pull request #27126 from kamipo/fix_unsigned_with_zerofillRafael França2016-11-294-2/+9
|\
| * Fix that unsigned with zerofill is treated as signedRyuta Kamizono2016-11-274-2/+9
* | Let's use only vendored rails-ujs while we start to publish it to npm registryGuillermo Iguaran2016-11-291-3/+1
* | Add CHANGELOG entry for --yarn optionLiceth Ovalles2016-11-291-0/+5
* | Merge pull request #26836 from Liceth/npmGuillermo Iguaran2016-11-298-3/+106
|\ \
| * | Run yarn on setup and update scripts.Liceth Ovalles2016-11-282-2/+8
| * | Add node_modules to default gitignoreLiceth Ovalles2016-11-281-0/+5
| * | Add node_modules path to assets load paths when --yarn option is usedLiceth Ovalles2016-11-282-0/+5
| * | Add package.json for Yarn if --yarn option is addedLiceth Ovalles2016-11-284-1/+88
* | | rails-ujs is now shipped with Action ViewGuillermo Iguaran2016-11-296-17/+2
* | | Merge pull request #27204 from JessRudder/22862-auth-note-on-testsJon Moss2016-11-281-0/+7
|\ \ \
| * | | Add note about step needed to get tests to pass if you implemented basic auth...JessRudder2016-11-281-0/+7
|/ / /
* | | Merge pull request #27196 from kirs/rubocop-gemRafael França2016-11-282-0/+16
|\ \ \
| * | | Add rubocop to GemfileKir Shatrov2016-11-282-0/+16
* | | | Merge pull request #27195 from y-yagi/use_public_module_includeSantiago Pastorino2016-11-273-3/+3
|\ \ \ \
| * | | | use public Module#include instead of send :includeyuuji.yaginuma2016-11-273-3/+3
* | | | | Merge pull request #27190 from jnoortheen/issue-27189Santiago Pastorino2016-11-271-3/+4
|\ \ \ \ \
| * | | | | fix: solves issue#27189jnoortheen2016-11-271-3/+4
* | | | | | Merge pull request #27193 from plentz/masterSantiago Pastorino2016-11-272-2/+28
|\ \ \ \ \ \
| * | | | | | fixing update_all and delete_all when chained with left_joins. fixes #27192Diego Plentz2016-11-272-2/+28
|/ / / / / /
* / / / / / [ci skip] Update the `as` docs.Kasper Timm Hansen2016-11-271-1/+2
|/ / / / /
* | | | / Remove default argument value.Kasper Timm Hansen2016-11-271-1/+1
| |_|_|/ |/| | |
* | | | Merge pull request #26865 from sergey-alekseev/uniqueness-validation-scope-wi...Matthew Draper2016-11-273-4/+23
|\ \ \ \
| * | | | fix the uniqueness validation scope with a polymorphic associationSergey Alekseev2016-11-263-4/+23
* | | | | abort_on_exception can't be disabled for a single threadMatthew Draper2016-11-272-6/+8
* | | | | Only start rabbitmq when we need itMatthew Draper2016-11-271-6/+19
* | | | | We expect exceptions; abort will just raise in the wrong placeMatthew Draper2016-11-272-9/+17
* | | | | Clear available connections immediatelyMatthew Draper2016-11-271-0/+2
| |/ / / |/| | |
* | | | Merge pull request #27183 from maclover7/jm-av-releaseGuillermo Iguaran2016-11-261-5/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Update RELEASING_RAILS.md for rails-ujsJon Moss2016-11-261-5/+7
|/ / /
* | | Merge pull request #27182 from maclover7/jm-actionview-buildGuillermo Iguaran2016-11-261-1/+9
|\ \ \
| * | | Add asset compilation Rake task for UJSJon Moss2016-11-261-1/+9
|/ / /
* | | Add UJS testsGuillermo Iguaran2016-11-2622-0/+5280
* | | Add rails-ujs to Action ViewGuillermo Iguaran2016-11-2614-0/+649
* | | Convert ActionView::Railtie into EngineGuillermo Iguaran2016-11-261-1/+1
* | | Make the test that seems to be getting stuck noisierMatthew Draper2016-11-261-35/+55
* | | Merge pull request #27179 from y-yagi/follow_up_to_8e1714bMatthew Draper2016-11-261-1/+1
|\ \ \