aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #29854 from assain/add_metadata_to_message_verifierKasper Timm Hansen2017-07-192-6/+48
|\
| * add metadata support to message verifierAssain2017-07-192-6/+48
|/
* Move back to @matthewd's close io fixed rb-inotify.Kasper Timm Hansen2017-07-192-2/+13
* Merge pull request #29599 from assain/add_meta_data_to_message_encryptorKasper Timm Hansen2017-07-194-6/+192
|\
| * Add expires_at, expires_in, and purpose meta_data to messages.Assain2017-07-194-6/+192
|/
* Merge pull request #29843 from y-yagi/fix_ruby_warningsKasper Timm Hansen2017-07-191-2/+2
|\
| * Fix `warning: circular argument reference`yuuji.yaginuma2017-07-191-2/+2
* | Merge pull request #29844 from kamipo/create_rails_user_on_travis_ciKasper Timm Hansen2017-07-191-0/+4
|\ \
| * | Create `rails@localhost` user on travis ciRyuta Kamizono2017-07-191-0/+4
| |/
* | Merge pull request #29845 from willnet/doc-rails-ujsGuillermo Iguaran2017-07-181-1/+1
|\ \ | |/ |/|
| * [ci skip]Replace jquery-ujs with rails-ujswillnet2017-07-191-1/+1
|/
* Merge pull request #29033 from kamipo/make_preload_query_to_prepared_statementsSean Griffin2017-07-184-4/+4
|\
| * Make preload query to preparableRyuta Kamizono2017-07-074-4/+4
* | Merge pull request #29840 from kamipo/fix_type_casting_time_for_mariadbSean Griffin2017-07-181-1/+0
|\ \
| * | Fix type casting a time for MariaDBRyuta Kamizono2017-07-191-1/+0
|/ /
* | Merge pull request #29775 from yui-knk/assign_onceSean Griffin2017-07-181-2/+2
|\ \
| * | Assign `content_type` only onceyui-knk2017-07-131-2/+2
* | | Merge pull request #29780 from MaxLap/fix_unscope_where_column_with_orSean Griffin2017-07-183-2/+34
|\ \ \
| * \ \ Merge branch 'master' into fix_unscope_where_column_with_orSean Griffin2017-07-18212-582/+1480
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #29785 from cswilliams/rescue_postgres_connection_errors_o...Sean Griffin2017-07-181-0/+1
|\ \ \ \
| * | | | Catch postgres connection errors when trying to dealloc the statement poolChris Williams2017-07-131-0/+1
* | | | | Merge pull request #29815 from posthumanism/add-except-optionSean Griffin2017-07-183-15/+440
|\ \ \ \ \
| * | | | | Add `except` option for ActiveJob::TestHelper methodsposthumanism2017-07-183-15/+440
* | | | | | Merge pull request #29834 from kamipo/fix_unscoping_default_scope_with_sti_as...Sean Griffin2017-07-186-3/+39
|\ \ \ \ \ \
| * | | | | | Fix unscoping `default_scope` for `Preloader`Ryuta Kamizono2017-07-192-1/+13
| * | | | | | Fix unscoping `default_scope` in STI associationsRyuta Kamizono2017-07-195-2/+26
* | | | | | | Don't convert dates to strings when using prepared statements in mysqlSean Griffin2017-07-182-3/+19
|/ / / / / /
* | | | | | Merge pull request #29839 from kamipo/fix_typoRafael França2017-07-181-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typo s/rause/raise/Ryuta Kamizono2017-07-191-1/+1
|/ / / / / /
* | | | | | Remove deprecated code concerning non-attributes and `*_will_change!`Sean Griffin2017-07-184-24/+7
* | | | | | Remove deprecated code concerning dirty methods in after callbacksSean Griffin2017-07-182-83/+11
* | | | | | Remove incorrect commentSean Griffin2017-07-181-2/+0
|/ / / / /
* | | | | Merge pull request #29828 from kamipo/fix_using_custom_table_with_joinsRafael França2017-07-176-18/+29
|\ \ \ \ \
| * | | | | Fix `JoinDependency` with using a custom tableRyuta Kamizono2017-07-186-18/+29
* | | | | | Merge pull request #29830 from schneems/schneems/codetriage-badgeSean Griffin2017-07-171-0/+2
|\ \ \ \ \ \
| * | | | | | [ci skip] CodeTriage badgeschneems2017-07-171-0/+2
|/ / / / / /
* | | | | | Merge pull request #26343 from ccutrer/runner_from_stdinSean Griffin2017-07-174-2/+20
|\ \ \ \ \ \
| * | | | | | support `-` as an argument to `rails runner`Cody Cutrer2017-07-174-2/+20
|/ / / / / /
* / / / / / Rename helper to force_lazy_load_hooks.Kasper Timm Hansen2017-07-171-14/+14
|/ / / / /
* | | | | Merge pull request #29801 from kamipo/extract_null_relation_testSean Griffin2017-07-172-118/+82
|\ \ \ \ \
| * | | | | Ensure calculation methods execute no queriesRyuta Kamizono2017-07-151-60/+14
| * | | | | Extract `NullRelationTest` from `RelationTest`Ryuta Kamizono2017-07-152-118/+128
* | | | | | Merge pull request #29799 from kamipo/remove_outdated_test_scoped_responds_to...Sean Griffin2017-07-171-8/+0
|\ \ \ \ \ \
| * | | | | | Remove outdated `test_scoped_responds_to_delegated_methods`Ryuta Kamizono2017-07-151-8/+0
* | | | | | | Merge pull request #25564 from brewski/serializable_hash_fixSean Griffin2017-07-171-4/+2
|\ \ \ \ \ \ \
| * | | | | | | Correctly handle frozen options for ActiveRecord::Serialization#serializable_...Brian Abreu2016-12-092-5/+3
* | | | | | | | Merge pull request #29757 from lugray/hash_with_indifferent_access_defaultSean Griffin2017-07-172-10/+56
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix HashWithIndifferentAccess#default when include?(nil)Lisa Ugray2017-07-172-10/+56
* | | | | | | | | Merge pull request #29796 from kamipo/fix_where_with_custom_tableSean Griffin2017-07-172-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix `where` with a custom tableRyuta Kamizono2017-07-182-5/+5