aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Let Metadata instance handle purpose coercion.Kasper Timm Hansen2017-07-231-4/+4
* | | | | | | | | Remove dependency on `from_now` extension.Kasper Timm Hansen2017-07-231-1/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #29768 from janpieper/sort-enabled-extensions-in-dumpEileen M. Uchitelle2017-07-222-1/+15
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Sort enabled adapter extensions in schema dumpJan Pieper2017-07-122-1/+15
* | | | | | | | Merge pull request #29870 from kamipo/use_true_false_literalsSean Griffin2017-07-222-14/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Use `TRUE` and `FALSE` boolean literals for MySQLRyuta Kamizono2017-07-202-14/+6
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #29858 from y-yagi/use_argument_error_instead_of_own_error...Rafael França2017-07-212-19/+18
|\ \ \ \ \ \ \
| * | | | | | | Use `ArgumentError` instead of own error classyuuji.yaginuma2017-07-202-19/+18
| |/ / / / / /
* | | | | | | Merge pull request #29869 from kamipo/make_type_map_to_privateRafael França2017-07-219-31/+28
|\ \ \ \ \ \ \
| * | | | | | | Make `type_map` to private because it is only used in the connection adapterRyuta Kamizono2017-07-209-31/+28
| |/ / / / / /
* | | | | | | Merge pull request #29884 from padi/update_rails_5_upgrade_guideRafael França2017-07-212-2/+12
|\ \ \ \ \ \ \
| * | | | | | | Suppress documentation for content_tag_for and div_for since they were remove...Marc Rendl Ignacio2017-07-211-2/+2
| * | | | | | | Updates Rails upgrade guide for 4.2 to 5.0 regarding the removal of `ActionVi...Marc Rendl Ignacio2017-07-211-0/+10
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #29885 from freeletics/fix-false-positive-testRafael França2017-07-211-11/+11
|\ \ \ \ \ \ \
| * | | | | | | Fix false positive test related to wrong app root path.Wojciech Wnętrzak2017-07-211-11/+11
* | | | | | | | Merge pull request #29855 from lugray/has_one_destroyed_by_associationRafael França2017-07-213-0/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | Match destroyed_by_association for has_one to has_manyLisa Ugray2017-07-213-0/+42
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #29732 from kirs/frozen-activerecordRafael França2017-07-21678-11/+1367
|\ \ \ \ \ \ \ \
| * | | | | | | | Reset column information after schema changedyuuji.yaginuma2017-07-202-0/+4
| * | | | | | | | Use frozen-string-literal in ActiveRecordKir Shatrov2017-07-19677-11/+1363
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Revert "Extract `bind_param` and `bind_attribute` into `ActiveRecord::TestCase`"Sean Griffin2017-07-2113-46/+56
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #29882 from y-yagi/fix_ujs_test_postprocessingKasper Timm Hansen2017-07-211-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove log directory in test postprocessingyuuji.yaginuma2017-07-211-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #29872 from padi/add_jquery_vendor_for_ujs_testingGuillermo Iguaran2017-07-202-1/+9832
|\ \ \ \ \ \ \
| * | | | | | | Add jQuery to test vendor filesMarc Rendl Ignacio2017-07-202-1/+9832
| |/ / / / / /
* | | | | | | Merge pull request #29851 from printercu/patch-1Eileen M. Uchitelle2017-07-201-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Make `rails yarn:install` ignore dev dependenciesprintercu2017-07-191-1/+1
| |/ / / / /
* | | | | | 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