aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #31145 from dwightwatson/feature/preview-sortingRafael França2017-11-131-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Sort mailer previewsDwight Watson2017-11-141-1/+1
|/ / / / / / /
* | | | | | | Preserve existing metadata when analyzing a blobGeorge Claghorn2017-11-133-3/+28
* | | | | | | Merge pull request #31117 from renuo/fix_errors_addedRafael França2017-11-132-3/+14
|\ \ \ \ \ \ \
| * | | | | | | fix bug on added? methodAlessandro Rodi2017-11-132-3/+14
* | | | | | | | Properly cast input in `update_all`Sean Griffin2017-11-133-2/+14
* | | | | | | | Merge pull request #30980 from sobrinho/sobrinho/arel-star-ignored-columnsRafael França2017-11-136-45/+68
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix postgres ordering issue on default scoping testGabriel Sobrinho2017-11-131-15/+15
| * | | | | | | | Change tests to use models which don't ignore any columnsJon Moss2017-11-133-30/+30
| * | | | | | | | Do not use `Arel.star` when `ignored_columns`Jon Moss2017-11-132-0/+23
* | | | | | | | | Use .tt extension to all the template filesRafael Mendonça França2017-11-13113-4/+4
* | | | | | | | | Merge pull request #31137 from y-yagi/make_sidekiq_and_resque_integration_tes...Ryuta Kamizono2017-11-133-11/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make sidekiq and resque integration tests work in CIyuuji.yaginuma2017-11-133-9/+5
| * | | | | | | | | Return a non zero code when can not connect to redis in CIyuuji.yaginuma2017-11-132-2/+4
* | | | | | | | | | Add new error class `StatementTimeout` which will be raised when statement ti...Ryuta Kamizono2017-11-136-2/+73
* | | | | | | | | | Merge pull request #31139 from avneetmalhotra/touch_callback_documentation_fixRyuta Kamizono2017-11-131-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move touch method from Skipping Callbacks section to Running Callbacks sectio...Avneet Singh Malhotra2017-11-131-1/+1
* | | | | | | | | | | Merge pull request #30893 from y-yagi/verify_credentials_format_before_savingKasper Timm Hansen2017-11-132-1/+15
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Verify credentials format before savingyuuji.yaginuma2017-11-132-1/+15
* | | | | | | | | | | Action Cable: run Redis tests against a default config without a passwordJeremy Daer2017-11-132-3/+22
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #30773 from y-yagi/fix_30765Eileen M. Uchitelle2017-11-123-1/+36
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make automatically synchronize test schema work inside engineyuuji.yaginuma2017-10-023-1/+36
* | | | | | | | | | | Merge pull request #30791 from felipecvo/nested-attributes-docEileen M. Uchitelle2017-11-121-0/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add update_only example to AR nested attributes doc [ci_skip]Felipe Oliveira2017-10-031-0/+12
* | | | | | | | | | | | Revert displaying master key generation info on `rails new`.Kasper Timm Hansen2017-11-123-23/+20
* | | | | | | | | | | | Deprecate encrypted secrets in favor of credentials.Kasper Timm Hansen2017-11-126-167/+50
* | | | | | | | | | | | Merge pull request #30770 from y-yagi/do_not_create_credential_in_dummy_appli...Kasper Timm Hansen2017-11-123-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Do not create credentials in dummy applicationyuuji.yaginuma2017-10-023-2/+5
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #31131 from y-yagi/remove_unused_requiresRyuta Kamizono2017-11-121-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove unused requireyuuji.yaginuma2017-11-121-2/+0
* | | | | | | | | | | | | Raise `TransactionTimeout` when lock wait timeout exceeded for PG adapterRyuta Kamizono2017-11-114-3/+35
* | | | | | | | | | | | | Should test actual error which is raised from the databaseRyuta Kamizono2017-11-111-1/+23
|/ / / / / / / / / / / /
* | | | | | | | | | | | Add missing autoload `Type` (#31123)Ryuta Kamizono2017-11-1119-17/+2
* | | | | | | | | | | | Relation merging should keep joining orderRyuta Kamizono2017-11-112-10/+17
* | | | | | | | | | | | Add missing require "active_support/core_ext/hash/indifferent_access"Ryuta Kamizono2017-11-101-0/+2
* | | | | | | | | | | | Fix random CI failure due to non-deterministic sorting orderRyuta Kamizono2017-11-101-1/+1
* | | | | | | | | | | | Consolidate duplicated `to_ary`/`to_a` definitions in `Relation` and `Collect...Ryuta Kamizono2017-11-103-6/+9
* | | | | | | | | | | | Ensure `apply_join_dependency` for subqueries in `from` and `where`Ryuta Kamizono2017-11-103-0/+19
* | | | | | | | | | | | :scissors:Ryuta Kamizono2017-11-101-2/+2
* | | | | | | | | | | | Adjust blank linesRyuta Kamizono2017-11-104-4/+5
* | | | | | | | | | | | Merge pull request #31065 from bogdan/cleanup-cache-keyAndrew White2017-11-101-26/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove code duplication in ActiveSupport::CacheBogdan Gusiev2017-11-091-26/+11
* | | | | | | | | | | | | Merge pull request #31119 from y-yagi/add_missing_requiresRyuta Kamizono2017-11-101-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add missing requiresyuuji.yaginuma2017-11-101-0/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Remove useless preloader classesRyuta Kamizono2017-11-1010-104/+15
* | | | | | | | | | | | | Merge pull request #31118 from aycabta/fix-rdoc-urlAkira Matsuda2017-11-102-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use new Rake URL of Ruby core [ci skip]aycabta2017-11-101-1/+1
| * | | | | | | | | | | | | Use new RDoc URL of Ruby core [ci skip]aycabta2017-11-101-3/+3
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #31114 from y-yagi/fix_ruby_warnings_in_active_modelRyuta Kamizono2017-11-102-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix "warning: assigned but unused variable - name"yuuji.yaginuma2017-11-101-1/+1