aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #29654 from kamipo/fix_deprecation_messageKasper Timm Hansen2017-07-021-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix removed version 5.2 to 6.0 in the deprecation messageRyuta Kamizono2017-07-021-1/+1
* | | | | | | | | Merge pull request #29656 from y-yagi/move_tmp_clear_testKasper Timm Hansen2017-07-022-7/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Move test related to `tmp:clear` task to `tmp_test.rb`yuuji.yaginuma2017-07-022-7/+7
|/ / / / / / / /
* | | | | | | | Apply record state based on parent transaction stateeileencodes2017-07-014-3/+96
* | | | | | | | Deprecate and replace `set_state` methodeileencodes2017-07-013-6/+73
* | | | | | | | Merge pull request #29622 from yalab/warning_system_tesing_http_verbEileen M. Uchitelle2017-07-013-0/+58
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | SystemTestCase undef some IntegrationTest methods because it's confused to use.yalab2017-07-013-0/+58
* | | | | | | | Avoid shadowed variableMatthew Draper2017-07-021-2/+2
* | | | | | | | Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-022231-2246/+13
* | | | | | | | Merge pull request #29540 from kirs/rubocop-frozen-stringMatthew Draper2017-07-022231-13/+2246
|\ \ \ \ \ \ \ \
| * | | | | | | | Enforce frozen string in RubocopKir Shatrov2017-07-012230-13/+2245
* | | | | | | | | Merge pull request #29506 from pat/frozen-string-literalsMatthew Draper2017-07-0265-323/+323
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make ActionView frozen string literal friendly.Pat Allan2017-06-2022-223/+223
| * | | | | | | | | Make ActionMailer frozen string literal friendly.Pat Allan2017-06-205-7/+7
| * | | | | | | | | Make ActiveRecord frozen string literal friendly.Pat Allan2017-06-2021-44/+43
| * | | | | | | | | Make ActiveModel frozen string literal friendly.Pat Allan2017-06-204-5/+5
| * | | | | | | | | Make ActiveSupport frozen string literal friendly.Pat Allan2017-06-2016-44/+45
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #29349 from robertomiranda/responsive-imagesMatthew Draper2017-07-023-3/+24
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Add `srcset` option to `image_tag` helperRoberto Miranda2017-06-293-2/+23
* | | | | | | | | Merge pull request #29534 from y-yagi/clear_screenshots_in_tmp_clear_taskEileen M. Uchitelle2017-07-014-9/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Clear screenshots files in `tmp:clear` taskyuuji.yaginuma2017-06-274-9/+57
* | | | | | | | | | Merge pull request #29650 from koic/add_metadata_link_to_railties_gemspecEileen M. Uchitelle2017-07-011-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add source code and changelog link to railties.gemspecKoichi ITO2017-07-011-0/+5
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #29631 from kamipo/should_be_clear_association_idsMatthew Draper2017-07-012-2/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Should be clear `@association_ids` when joined newly associated recordRyuta Kamizono2017-06-302-2/+16
* | | | | | | | | | | Merge pull request #29634 from kamipo/dont_cache_queries_for_schema_statementsMatthew Draper2017-07-0110-55/+70
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Don't cache queries for schema statementsRyuta Kamizono2017-06-3010-55/+70
* | | | | | | | | | | | Merge pull request #29644 from wilson/unify-route-helper-visibilityMatthew Draper2017-07-012-18/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Properly register "custom" URL helpers as named helpers.Wilson Bilkovich2017-06-302-18/+16
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #28808 from fschwahn/fix-polymorphic-automic-inverseMatthew Draper2017-07-013-10/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add regression test for setting inverse instances on normal & polymorphic rel...Fabian Schwahn2017-04-201-0/+14
| * | | | | | | | | | | | Remove :polymorphic from INVALID_AUTOMATIC_INVERSE_OPTIONSFabian Schwahn2017-04-202-10/+5
* | | | | | | | | | | | | Merge pull request #29536 from nickrivadeneira/fix-yamlMatthew Draper2017-07-012-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Ensure `false` is preserved in attr serializationNick Rivadeneira2017-06-222-1/+9
| | | | | | | | | | | | * | [Action Cable] require => require_relativeAkira Matsuda2017-07-013-3/+3
| | | | | | | | | | | | * | [Active Job] require => require_relativeAkira Matsuda2017-07-014-13/+13
| | | | | | | | | | | | * | [Action Mailer] require => require_relativeAkira Matsuda2017-07-012-4/+4
| | | | | | | | | | | | * | [Action View] require => require_relativeAkira Matsuda2017-07-0125-35/+35
| | | | | | | | | | | | * | [Action Pack] require => require_relativeAkira Matsuda2017-07-011-1/+1
| | | | | | | | | | | | * | [Action Controller] require => require_relativeAkira Matsuda2017-07-017-9/+9
| | | | | | | | | | | | * | [Abstract Controller] require => require_relativeAkira Matsuda2017-07-012-2/+2
| | | | | | | | | | | | * | [Action Dispatch] require => require_relativeAkira Matsuda2017-07-0127-57/+57
| | | | | | | | | | | | * | [Active Record] require => require_relativeAkira Matsuda2017-07-0135-135/+135
| | | | | | | | | | | | * | [Active Model] require => require_relativeAkira Matsuda2017-07-017-23/+23
| | | | | | | | | | | | * | [Active Support] require => require_relativeAkira Matsuda2017-07-01129-383/+383
| | | | | | | | | | | | * | [Railties] require => require_relativeAkira Matsuda2017-07-0171-107/+107
| |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #29629 from koic/fix_next_version_of_railsMatthew Draper2017-07-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix the next version of Rails from 5.3 to 6.0Koichi ITO2017-06-301-1/+1
* | | | | | | | | | | | | | Merge pull request #29646 from y-yagi/fix_format_of_ap_to_sRyuta Kamizono2017-07-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \