Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Move back to @matthewd's close io fixed rb-inotify. | Kasper Timm Hansen | 2017-07-19 | 2 | -2/+13 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #29599 from assain/add_meta_data_to_message_encryptor | Kasper Timm Hansen | 2017-07-19 | 4 | -6/+192 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||
| * | | | | Add expires_at, expires_in, and purpose meta_data to messages. | Assain | 2017-07-19 | 4 | -6/+192 | |
|/ / / / | ||||||
* | | | | Merge pull request #29843 from y-yagi/fix_ruby_warnings | Kasper Timm Hansen | 2017-07-19 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | Fix `warning: circular argument reference` | yuuji.yaginuma | 2017-07-19 | 1 | -2/+2 | |
* | | | | | Merge pull request #29844 from kamipo/create_rails_user_on_travis_ci | Kasper Timm Hansen | 2017-07-19 | 1 | -0/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | Create `rails@localhost` user on travis ci | Ryuta Kamizono | 2017-07-19 | 1 | -0/+4 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #29845 from willnet/doc-rails-ujs | Guillermo Iguaran | 2017-07-18 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | [ci skip]Replace jquery-ujs with rails-ujs | willnet | 2017-07-19 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #29033 from kamipo/make_preload_query_to_prepared_statements | Sean Griffin | 2017-07-18 | 4 | -4/+4 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | Make preload query to preparable | Ryuta Kamizono | 2017-07-07 | 4 | -4/+4 | |
* | | | | Merge pull request #29840 from kamipo/fix_type_casting_time_for_mariadb | Sean Griffin | 2017-07-18 | 1 | -1/+0 | |
|\ \ \ \ | ||||||
| * | | | | Fix type casting a time for MariaDB | Ryuta Kamizono | 2017-07-19 | 1 | -1/+0 | |
|/ / / / | ||||||
* | | | | Merge pull request #29775 from yui-knk/assign_once | Sean Griffin | 2017-07-18 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | Assign `content_type` only once | yui-knk | 2017-07-13 | 1 | -2/+2 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #29780 from MaxLap/fix_unscope_where_column_with_or | Sean Griffin | 2017-07-18 | 3 | -2/+34 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'master' into fix_unscope_where_column_with_or | Sean Griffin | 2017-07-18 | 212 | -582/+1480 | |
| |\ \ \ \ | |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #29785 from cswilliams/rescue_postgres_connection_errors_o... | Sean Griffin | 2017-07-18 | 1 | -0/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Catch postgres connection errors when trying to dealloc the statement pool | Chris Williams | 2017-07-13 | 1 | -0/+1 | |
* | | | | | | Merge pull request #29815 from posthumanism/add-except-option | Sean Griffin | 2017-07-18 | 3 | -15/+440 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add `except` option for ActiveJob::TestHelper methods | posthumanism | 2017-07-18 | 3 | -15/+440 | |
* | | | | | | | Merge pull request #29834 from kamipo/fix_unscoping_default_scope_with_sti_as... | Sean Griffin | 2017-07-18 | 6 | -3/+39 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix unscoping `default_scope` for `Preloader` | Ryuta Kamizono | 2017-07-19 | 2 | -1/+13 | |
| * | | | | | | | Fix unscoping `default_scope` in STI associations | Ryuta Kamizono | 2017-07-19 | 5 | -2/+26 | |
* | | | | | | | | Don't convert dates to strings when using prepared statements in mysql | Sean Griffin | 2017-07-18 | 2 | -3/+19 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #29839 from kamipo/fix_typo | Rafael França | 2017-07-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix typo s/rause/raise/ | Ryuta Kamizono | 2017-07-19 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Remove deprecated code concerning non-attributes and `*_will_change!` | Sean Griffin | 2017-07-18 | 4 | -24/+7 | |
* | | | | | | | Remove deprecated code concerning dirty methods in after callbacks | Sean Griffin | 2017-07-18 | 2 | -83/+11 | |
* | | | | | | | Remove incorrect comment | Sean Griffin | 2017-07-18 | 1 | -2/+0 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #29828 from kamipo/fix_using_custom_table_with_joins | Rafael França | 2017-07-17 | 6 | -18/+29 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix `JoinDependency` with using a custom table | Ryuta Kamizono | 2017-07-18 | 6 | -18/+29 | |
* | | | | | | | Merge pull request #29830 from schneems/schneems/codetriage-badge | Sean Griffin | 2017-07-17 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [ci skip] CodeTriage badge | schneems | 2017-07-17 | 1 | -0/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #26343 from ccutrer/runner_from_stdin | Sean Griffin | 2017-07-17 | 4 | -2/+20 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | support `-` as an argument to `rails runner` | Cody Cutrer | 2017-07-17 | 4 | -2/+20 | |
|/ / / / / / / | ||||||
* / / / / / / | Rename helper to force_lazy_load_hooks. | Kasper Timm Hansen | 2017-07-17 | 1 | -14/+14 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #29801 from kamipo/extract_null_relation_test | Sean Griffin | 2017-07-17 | 2 | -118/+82 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Ensure calculation methods execute no queries | Ryuta Kamizono | 2017-07-15 | 1 | -60/+14 | |
| * | | | | | | Extract `NullRelationTest` from `RelationTest` | Ryuta Kamizono | 2017-07-15 | 2 | -118/+128 | |
* | | | | | | | Merge pull request #29799 from kamipo/remove_outdated_test_scoped_responds_to... | Sean Griffin | 2017-07-17 | 1 | -8/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove outdated `test_scoped_responds_to_delegated_methods` | Ryuta Kamizono | 2017-07-15 | 1 | -8/+0 | |
* | | | | | | | | Merge pull request #25564 from brewski/serializable_hash_fix | Sean Griffin | 2017-07-17 | 1 | -4/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Correctly handle frozen options for ActiveRecord::Serialization#serializable_... | Brian Abreu | 2016-12-09 | 2 | -5/+3 | |
* | | | | | | | | | Merge pull request #29757 from lugray/hash_with_indifferent_access_default | Sean Griffin | 2017-07-17 | 2 | -10/+56 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix HashWithIndifferentAccess#default when include?(nil) | Lisa Ugray | 2017-07-17 | 2 | -10/+56 | |
* | | | | | | | | | | Merge pull request #29796 from kamipo/fix_where_with_custom_table | Sean Griffin | 2017-07-17 | 2 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix `where` with a custom table | Ryuta Kamizono | 2017-07-18 | 2 | -5/+5 | |
* | | | | | | | | | | | Merge pull request #29816 from kamipo/persistence_delete_should_not_be_affect... | Sean Griffin | 2017-07-17 | 2 | -1/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | `Persistence#delete` should not be affected by scoping | Ryuta Kamizono | 2017-07-18 | 2 | -1/+12 | |
|/ / / / / / / / / / |