Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | Add rubocop to Gemfile | Kir Shatrov | 2016-11-28 | 2 | -0/+16 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #27195 from y-yagi/use_public_module_include | Santiago Pastorino | 2016-11-27 | 3 | -3/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | use public Module#include instead of send :include | yuuji.yaginuma | 2016-11-27 | 3 | -3/+3 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #27190 from jnoortheen/issue-27189 | Santiago Pastorino | 2016-11-27 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | fix: solves issue#27189 | jnoortheen | 2016-11-27 | 1 | -3/+4 | |
* | | | | | | | | | Merge pull request #27193 from plentz/master | Santiago Pastorino | 2016-11-27 | 2 | -2/+28 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fixing update_all and delete_all when chained with left_joins. fixes #27192 | Diego Plentz | 2016-11-27 | 2 | -2/+28 | |
|/ / / / / / / / / | ||||||
* / / / / / / / / | [ci skip] Update the `as` docs. | Kasper Timm Hansen | 2016-11-27 | 1 | -1/+2 | |
|/ / / / / / / / | ||||||
* | | | / / / / | Remove default argument value. | Kasper Timm Hansen | 2016-11-27 | 1 | -1/+1 | |
| |_|_|/ / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #26865 from sergey-alekseev/uniqueness-validation-scope-wi... | Matthew Draper | 2016-11-27 | 3 | -4/+23 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix the uniqueness validation scope with a polymorphic association | Sergey Alekseev | 2016-11-26 | 3 | -4/+23 | |
* | | | | | | | | abort_on_exception can't be disabled for a single thread | Matthew Draper | 2016-11-27 | 2 | -6/+8 | |
* | | | | | | | | Only start rabbitmq when we need it | Matthew Draper | 2016-11-27 | 1 | -6/+19 | |
* | | | | | | | | We expect exceptions; abort will just raise in the wrong place | Matthew Draper | 2016-11-27 | 2 | -9/+17 | |
* | | | | | | | | Clear available connections immediately | Matthew Draper | 2016-11-27 | 1 | -0/+2 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #27183 from maclover7/jm-av-release | Guillermo Iguaran | 2016-11-26 | 1 | -5/+7 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Update RELEASING_RAILS.md for rails-ujs | Jon Moss | 2016-11-26 | 1 | -5/+7 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #27182 from maclover7/jm-actionview-build | Guillermo Iguaran | 2016-11-26 | 1 | -1/+9 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add asset compilation Rake task for UJS | Jon Moss | 2016-11-26 | 1 | -1/+9 | |
|/ / / / / / | ||||||
* | | | | | | Add UJS tests | Guillermo Iguaran | 2016-11-26 | 22 | -0/+5280 | |
* | | | | | | Add rails-ujs to Action View | Guillermo Iguaran | 2016-11-26 | 14 | -0/+649 | |
* | | | | | | Convert ActionView::Railtie into Engine | Guillermo Iguaran | 2016-11-26 | 1 | -1/+1 | |
* | | | | | | Make the test that seems to be getting stuck noisier | Matthew Draper | 2016-11-26 | 1 | -35/+55 | |
* | | | | | | Merge pull request #27179 from y-yagi/follow_up_to_8e1714b | Matthew Draper | 2016-11-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | use correct variable in BacktraceCleaner test | yuuji.yaginuma | 2016-11-26 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | We're not calling hooks here since 9e4c41c903e8e58721f2c41776a8c60ddba7a0a9 | Akira Matsuda | 2016-11-25 | 1 | -1/+0 | |
* | | | | | | Merge pull request #27140 from supercaracal/fix-force-ssl-if-session-store-di... | Rafael França | 2016-11-25 | 3 | -2/+20 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove aggressive unit test with mock. And add integration level test. | Taishi Kasuga | 2016-11-24 | 3 | -25/+19 | |
| * | | | | | | Fix a force ssl redirection bug that occur when session store disabled. | Taishi Kasuga | 2016-11-22 | 2 | -1/+25 | |
* | | | | | | | Merge pull request #23675 from kachick/activemodel-errors-indifferent | Rafael França | 2016-11-25 | 3 | -5/+19 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Allow indifferent access in ActiveModel::Errors | Kenichi Kamiya | 2016-11-22 | 3 | -5/+19 | |
* | | | | | | | | Merge pull request #27165 from prathamesh-sonpatki/followup-uuid-extension-ch... | Rafael França | 2016-11-25 | 2 | -6/+16 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Followup of UUID default extension in the docs [ci skip] | Prathamesh Sonpatki | 2016-11-24 | 2 | -6/+16 | |
* | | | | | | | | | Merge pull request #26874 from tgxworld/fix_broadcast_logger | Matthew Draper | 2016-11-25 | 2 | -5/+21 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | `Broadcast#silence` breaks custom loggers that does not include `LoggerSilence`. | Guo Xiang Tan | 2016-10-24 | 2 | -5/+21 | |
* | | | | | | | | | | Merge pull request #27174 from kamipo/fix_require_dependency_message_format | Matthew Draper | 2016-11-25 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix `require_dependency` message format | Ryuta Kamizono | 2016-11-25 | 2 | -2/+2 | |
* | | | | | | | | | | | Merge pull request #27173 from kamipo/fix_warning_method_redefined | Matthew Draper | 2016-11-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix warning: method redefined; discarding old fields | Ryuta Kamizono | 2016-11-25 | 1 | -1/+1 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #27172 from kamipo/should_test_change_column_default | Matthew Draper | 2016-11-25 | 1 | -13/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Should test `test_change_column_default` in `PostgresqlUUIDTest` | Ryuta Kamizono | 2016-11-25 | 1 | -13/+13 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #27171 from kamipo/suppress_migration_message | Matthew Draper | 2016-11-25 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Suppress migration message in the test | Ryuta Kamizono | 2016-11-25 | 1 | -0/+4 | |
* | | | | | | | | | | | Merge pull request #27170 from kamipo/remove_blank_else_block | Matthew Draper | 2016-11-25 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Remove blank else block | Ryuta Kamizono | 2016-11-25 | 1 | -1/+0 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #27108 from matthewd/allocate-connections-after-blocking | Matthew Draper | 2016-11-25 | 2 | -25/+17 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Distribute connections to previously blocked threads when we're done | Matthew Draper | 2016-11-25 | 2 | -25/+17 | |
* | | | | | | | | | | | Merge pull request #26718 from domcleal/5-0-stable-ids-writer-exception | Matthew Draper | 2016-11-25 | 5 | -8/+40 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add test for collection *_ids= setter when association primary key set | Dominic Cleal | 2016-11-24 | 4 | -1/+23 | |
| * | | | | | | | | | | | Restore RecordNotFound when *_ids= can't find records by ID | Dominic Cleal | 2016-11-24 | 4 | -7/+17 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | |