aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #30367 from ptoomey3/consistent-cache-control-headersAaron Patterson2017-09-053-8/+34
|\
| * Don't touch an unused headerPatrick Toomey2017-08-231-1/+0
| * Decouple the merge/normalization and conditional cache control logicPatrick Toomey2017-08-232-5/+13
| * This constant is no longer usedPatrick Toomey2017-08-221-1/+0
| * Let middleware handle default cache behaviorPatrick Toomey2017-08-221-1/+2
| * Use equality in place of refute assertions for accuracyPatrick Toomey2017-08-221-4/+2
| * Normalize/process Cach-Control headers consistentlyPatrick Toomey2017-08-222-3/+24
* | Merge pull request #29791 from yui-knk/at_objectRyuta Kamizono2017-09-0513-19/+19
|\ \
| * | Do not pass an instance variable to a private methodyui-knk2017-09-0513-19/+19
* | | Merge pull request #30520 from rails/railties-rails-commandMatthew Draper2017-09-0521-289/+339
|\ \ \
| * | | Run in-app rails commands via fork+load where possibleMatthew Draper2017-09-0421-289/+339
* | | | Don't pass unneeded `reflection` to `add_constraints`Ryuta Kamizono2017-09-051-3/+3
* | | | Merge pull request #30517 from y-yagi/fix_30516Kasper Timm Hansen2017-09-042-0/+7
|\ \ \ \
| * | | | Explicitly require `test_unit/reporter` in test helperyuuji.yaginuma2017-09-042-0/+7
| |/ / /
* | | | Merge pull request #30407 from assain/document-expiry-metadata-support-cookiesKasper Timm Hansen2017-09-042-4/+28
|\ \ \ \
| * | | | This commit adds:Assain2017-09-042-4/+28
| |/ / /
* | | | Assigning `values` is only necessary when `reflection_scope.where_clause` is ...Ryuta Kamizono2017-09-051-1/+1
* | | | Don't merge `reflection_scope` if `reflection.scope` isn't givenRyuta Kamizono2017-09-051-1/+1
* | | | Should quote composite primary key namesRyuta Kamizono2017-09-042-2/+12
|/ / /
* | | Don't need the layout hereMatthew Draper2017-09-041-0/+2
* | | Preload some additional specific filesMatthew Draper2017-09-041-0/+3
* | | Preload Rails component gems in railties testsMatthew Draper2017-09-044-2/+22
* | | Scope in associations should treat nil as `all`Ryuta Kamizono2017-09-046-9/+11
* | | Run all railties tests before reporting failureMatthew Draper2017-09-031-1/+14
* | | Don't start a new process for every test fileMatthew Draper2017-09-031-10/+34
* | | Don't expose `find_all_ordered` utility method in testsRyuta Kamizono2017-09-021-4/+5
* | | Merge pull request #30509 from y-yagi/remove_outdated_commentRyuta Kamizono2017-09-021-1/+1
|\ \ \
| * | | Fix outdated comment [ci skip]yuuji.yaginuma2017-09-021-1/+1
* | | | Retry if rubygems misbehaves: it's probably just the networkMatthew Draper2017-09-021-2/+2
* | | | Fix preloading through association with custom scopeRyuta Kamizono2017-09-022-1/+11
* | | | Merge pull request #30493 from koic/fix_cant_modify_frozen_string_error_in_ac...Ryuta Kamizono2017-09-022-1/+13
|\ \ \ \
| * | | | Fix `can't modify frozen String` error in AC::RenderingKoichi ITO2017-09-022-1/+13
* | | | | Merge pull request #30506 from yhirano55/replace_unnecessary_links_with_tt_textRyuta Kamizono2017-09-021-2/+2
|\ \ \ \ \
| * | | | | Replace unnecessary link with typewriter text [ci skip]Yoshiyuki Hirano2017-09-021-2/+2
* | | | | | Accept GCS client optionsGeorge Claghorn2017-09-011-2/+2
|/ / / / /
* | | | | Add a test case for preloading through association with implicit sourceRyuta Kamizono2017-09-021-0/+8
* | | | | `values[:includes]` in `reflection_scope` is not compatible with `through_scope`Ryuta Kamizono2017-09-022-2/+7
* | | | | Don't call `scope.eager_loading?` when `reflection_scope.where_clause` is emptyRyuta Kamizono2017-09-021-10/+10
* | | | | Merge pull request #30503 from yahonda/bump_postgresql_and_ruby_versionsRyuta Kamizono2017-09-021-1/+1
|\ \ \ \ \
| * | | | | Bump PostgreSQL version to the latest version 9.6 at Travis CIYasuo Honda2017-09-011-1/+1
|/ / / / /
* | | | | Merge pull request #30499 from yahonda/diag_floatRyuta Kamizono2017-09-022-9/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | sqlite3 adapter returns integer value which used to be stringYasuo Honda2017-09-012-9/+4
|/ / / /
* | | | Merge pull request #29850 from yahonda/test_with_mariadb_102_on_trustyRyuta Kamizono2017-09-012-1/+5
|\ \ \ \
| * | | | Skip `test_remove_column_with_multi_column_index`Yasuo Honda2017-09-011-0/+4
| * | | | CI with the latest stable(GA) version of MariaDB 10.2Yasuo Honda2017-09-011-1/+1
* | | | | `add_reference` should respect column position for both reference id and type...Ryuta Kamizono2017-09-012-1/+11
|/ / / /
* | | | Remove unused requireRyuta Kamizono2017-09-011-2/+0
* | | | :warning: assigned but unused variable - messageAkira Matsuda2017-09-011-6/+6
* | | | Unused variablesAkira Matsuda2017-09-011-2/+2
* | | | Hash#transform_keys is in Ruby 2.5+Akira Matsuda2017-09-011-2/+2