aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix gemfile.lockRafael Mendonça França2019-03-131-49/+49
* Revert "Remove Marshal support from SchemaCache"Rafael Mendonça França2019-03-132-0/+29
* Merge tag 'v6.0.0.beta3'eileencodes2019-03-1338-36/+156
|\
| * Prep releaseeileencodes2019-03-1132-69/+134
| * Fix possible dev mode RCEAaron Patterson2019-03-104-6/+43
| * Only accept formats from registered mime typesJohn Hawthorn2019-03-103-6/+23
* | Fix typo s/ActiveSupport::Timezone/ActiveSupport::TimeZone/ [ci skip]Ryuta Kamizono2019-03-131-1/+1
* | Merge pull request #35601 from yahonda/bigint_supportVipul A M2019-03-131-1/+1
|\ \
| * | [skip ci] Rails 5.1+ supports bigint primary keyYasuo Honda2019-03-131-1/+1
* | | Indentation >>Akira Matsuda2019-03-131-3/+3
* | | Fix rubocop violationsyuuji.yaginuma2019-03-131-1/+1
|/ /
* | Add test for runner command with `environment` optionyuuji.yaginuma2019-03-131-0/+4
* | Document int Primary Key with create_or_find_by (#35573)Alex Kitchens2019-03-121-0/+4
* | Merge pull request #35558 from rails/schema-cache-indexesKasper Timm Hansen2019-03-132-14/+43
|\ \
| * | Schema Cache: cache table indexesKasper Timm Hansen2019-03-132-14/+43
|/ /
* | Merge branch 'test-remove-marshal-support-from-schema-cache'Kasper Timm Hansen2019-03-122-26/+0
|\ \
| * | Remove Marshal support from SchemaCacheKasper Timm Hansen2019-03-122-26/+0
* | | Modernize size calculation in Schema CacheKasper Timm Hansen2019-03-121-1/+1
* | | Merge pull request #35591 from nisusam/update_link_sign_releaseRyuta Kamizono2019-03-131-1/+1
|\ \ \ | |/ / |/| |
| * | Update URL in RELEASING_RAILS.md [ci skip]nisusam2019-03-131-1/+1
|/ /
* | Remove unused `Row` class in `SelectManager`Ryuta Kamizono2019-03-131-12/+0
* | Initialize `@default_timezone` and `@timestamp_decoder` in `add_pg_decoders`Ryuta Kamizono2019-03-131-2/+3
* | Merge pull request #35585 from sharang-d/changelog-updateRafael França2019-03-121-4/+3
|\ \
| * | Edit a changelog entry [ci skip]Sharang Dashputre2019-03-121-4/+3
* | | Merge pull request #35583 from cpruitt/add-addititonal-tests-for-dummy-erbEileen M. Uchitelle2019-03-121-0/+54
|\ \ \
| * | | Add additional ERB DummyCompiler testsCliff Pruitt2019-03-121-0/+54
| |/ /
* | | Merge pull request #35577 from sharang-d/typo-opt-outVipul A M2019-03-123-13/+13
|\ \ \
| * | | Change wording of some instances of 'opt out' [ci skip]Sharang Dashputre2019-03-123-13/+13
* | | | Merge pull request #35586 from KurtRMueller/masterRyuta Kamizono2019-03-131-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Update small typo in documentation.Kurt Mueller2019-03-121-1/+1
|/ / /
* | | Merge pull request #35581 from prathamesh-sonpatki/action_mailbox_errorKasper Timm Hansen2019-03-122-0/+5
|\ \ \
| * | | Show friendly message to install action mailbox if the related table does not...Prathamesh Sonpatki2019-03-122-0/+5
* | | | Merge pull request #35582 from vipulnsward/kill-warning-from-guidesKasper Timm Hansen2019-03-121-1/+1
|\ \ \ \
| * | | | After https://github.com/rails/rails/pull/35281 and https://github.com/rails...Vipul A M2019-03-121-1/+1
* | | | | Merge pull request #35530 from Rodrigora/patch-1Vipul A M2019-03-121-0/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add note about has_many associations callbacks [ci skip]Rodrigo2019-03-121-0/+11
* | | | | Merge pull request #35575 from sharang-d/changelog-for-parameterizeRyuta Kamizono2019-03-121-1/+13
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add changelog entry for transliterate/parameterize accepting `locale` [ci skip]Sharang Dashputre2019-03-121-0/+10
* | | | | Merge pull request #35424 from Korri/validation-rules-locale-fallbackRafael França2019-03-113-11/+56
|\ \ \ \ \
| * | | | | Update Changelog with new locale fallback behavior on validationHugo Vacher2019-03-111-0/+24
| * | | | | Fall back to parent locale before it falls back to the :errors namespaceHugo Vacher2019-03-042-11/+32
* | | | | | bump Zeitwerk to 1.3.3Xavier Noria2019-03-112-4/+4
* | | | | | Merge pull request #35576 from sharang-d/fix-typo-overridenVipul A M2019-03-121-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | overriden -> overridden [ci skip]Sharang Dashputre2019-03-121-1/+1
|/ / / / /
* | | | | Do not generate dummy string when the tag used is not the <%=Rafael Mendonça França2019-03-112-1/+5
* | | | | Merge pull request #35572 from sharang-d/tests-for-transliterate-locale-argKasper Timm Hansen2019-03-114-1/+19
|\ \ \ \ \
| * | | | | Fix bug with parametrize when `locale` is passedSharang Dashputre2019-03-124-1/+19
* | | | | | Merge pull request #34955 from bogdanvlviv/follow-up-33962Kasper Timm Hansen2019-03-113-3/+9
|\ \ \ \ \ \
| * | | | | | Add `config.credentials.content_path` and `config.credentials.key_path` to th...bogdanvlviv2019-01-173-5/+10
* | | | | | | [ci skip] Improve `encrypted` commands USAGEKasper Timm Hansen2019-03-111-13/+19