aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | 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
|\ \ \ \ \ \
| * | | | | | use correct variable in BacktraceCleaner testyuuji.yaginuma2016-11-261-1/+1
|/ / / / / /
* | | | | | We're not calling hooks here since 9e4c41c903e8e58721f2c41776a8c60ddba7a0a9Akira Matsuda2016-11-251-1/+0
* | | | | | Merge pull request #27140 from supercaracal/fix-force-ssl-if-session-store-di...Rafael França2016-11-253-2/+20
|\ \ \ \ \ \
| * | | | | | Remove aggressive unit test with mock. And add integration level test.Taishi Kasuga2016-11-243-25/+19
| * | | | | | Fix a force ssl redirection bug that occur when session store disabled.Taishi Kasuga2016-11-222-1/+25
* | | | | | | Merge pull request #23675 from kachick/activemodel-errors-indifferentRafael França2016-11-253-5/+19
|\ \ \ \ \ \ \
| * | | | | | | Allow indifferent access in ActiveModel::ErrorsKenichi Kamiya2016-11-223-5/+19
* | | | | | | | Merge pull request #27165 from prathamesh-sonpatki/followup-uuid-extension-ch...Rafael França2016-11-252-6/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Followup of UUID default extension in the docs [ci skip]Prathamesh Sonpatki2016-11-242-6/+16
* | | | | | | | | Merge pull request #26874 from tgxworld/fix_broadcast_loggerMatthew Draper2016-11-252-5/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | `Broadcast#silence` breaks custom loggers that does not include `LoggerSilence`.Guo Xiang Tan2016-10-242-5/+21
* | | | | | | | | | Merge pull request #27174 from kamipo/fix_require_dependency_message_formatMatthew Draper2016-11-252-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix `require_dependency` message formatRyuta Kamizono2016-11-252-2/+2
* | | | | | | | | | | Merge pull request #27173 from kamipo/fix_warning_method_redefinedMatthew Draper2016-11-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix warning: method redefined; discarding old fieldsRyuta Kamizono2016-11-251-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #27172 from kamipo/should_test_change_column_defaultMatthew Draper2016-11-251-13/+13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Should test `test_change_column_default` in `PostgresqlUUIDTest`Ryuta Kamizono2016-11-251-13/+13
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #27171 from kamipo/suppress_migration_messageMatthew Draper2016-11-251-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Suppress migration message in the testRyuta Kamizono2016-11-251-0/+4
* | | | | | | | | | | Merge pull request #27170 from kamipo/remove_blank_else_blockMatthew Draper2016-11-251-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove blank else blockRyuta Kamizono2016-11-251-1/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #27108 from matthewd/allocate-connections-after-blockingMatthew Draper2016-11-252-25/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Distribute connections to previously blocked threads when we're doneMatthew Draper2016-11-252-25/+17
* | | | | | | | | | | Merge pull request #26718 from domcleal/5-0-stable-ids-writer-exceptionMatthew Draper2016-11-255-8/+40
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add test for collection *_ids= setter when association primary key setDominic Cleal2016-11-244-1/+23
| * | | | | | | | | | | Restore RecordNotFound when *_ids= can't find records by IDDominic Cleal2016-11-244-7/+17
| | |_|/ / / / / / / / | |/| | | | | | | | |