aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'v6.0.0.beta3'eileencodes2019-03-1338-36/+156
|\ | | | | | | v6.0.0.beta3 release
| * Prep releaseeileencodes2019-03-1132-69/+134
| | | | | | | | | | | | | | * Update RAILS_VERSION * Bundle * rake update_versions * rake changelog:header
| * Fix possible dev mode RCEAaron Patterson2019-03-104-6/+43
| | | | | | | | | | | | | | | | | | | | | | | | If the secret_key_base is nil in dev or test generate a key from random bytes and store it in a tmp file. This prevents the app developers from having to share / checkin the secret key for dev / test but also maintains a key between app restarts in dev/test. [CVE-2019-5420] Co-Authored-By: eileencodes <eileencodes@gmail.com> Co-Authored-By: John Hawthorn <john@hawthorn.email>
| * Only accept formats from registered mime typesJohn Hawthorn2019-03-103-6/+23
| | | | | | | | | | [CVE-2019-5418] [CVE-2019-5419]
* | 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 key
| * | [skip ci] Rails 5.1+ supports bigint primary keyYasuo Honda2019-03-131-1/+1
| | | | | | | | | | | | Follow up #35573
* | | 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
| | | | | | | | | | This commit addresses the issue in https://github.com/rails/rails/issues/35543 by making note of the growing primary key issue with `create_or_find_by`.
* | Merge pull request #35558 from rails/schema-cache-indexesKasper Timm Hansen2019-03-132-14/+43
|\ \ | | | | | | Schema Cache: cache table indexes
| * | Schema Cache: cache table indexesKasper Timm Hansen2019-03-132-14/+43
|/ / | | | | | | | | | | Useful to not query for indexes when an application uses schema cache. Ref https://github.com/rails/rails/pull/35546
* | 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
| | | | | | | | | | | | | | | YAML has been used to serialize the schema cache ever since 2016 with Rails 5.1: 4c00c6ed
* | | Modernize size calculation in Schema CacheKasper Timm Hansen2019-03-121-1/+1
| | | | | | | | | | | | | | | Not looking for other contributions like this, but I took the liberty since I was already working on this.
* | | Merge pull request #35591 from nisusam/update_link_sign_releaseRyuta Kamizono2019-03-131-1/+1
|\ \ \ | |/ / |/| | Update URL in RELEASING_RAILS.md [ci skip]
| * | Update URL in RELEASING_RAILS.md [ci skip]nisusam2019-03-131-1/+1
|/ / | | | | | | | | * Update valid link for `signing release tag` from `git-scm` book * Use `en`(English) instead of `tr`(Turkish) documentation link
* | Remove unused `Row` class in `SelectManager`Ryuta Kamizono2019-03-131-12/+0
| | | | | | | | The `Row` class is no longer used since d956772b3c61d97940ebcccd7c83e2397ca0c36c.
* | Initialize `@default_timezone` and `@timestamp_decoder` in `add_pg_decoders`Ryuta Kamizono2019-03-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Staled `@default_timezone` would cause an error on `reconnect!` after `disconnect!`. https://buildkite.com/rails/rails/builds/59495#23be8079-3a4f-4375-9991-0a6f874554f2 Steps to reproduce: ``` % ARCONN=postgresql bin/test test/cases/adapter_test.rb test/cases/base_test.rb -n "/(?:test_attributes_on_dummy_time|test_reconnect_after_a_disconnect)$/" --seed 15849 Using postgresql Run options: -n "/(?:test_attributes_on_dummy_time|test_reconnect_after_a_disconnect)$/" --seed 15849 # Running: . E Error: ActiveRecord::AdapterTestWithoutTransaction#test_reconnect_after_a_disconnect: NoMethodError: undefined method `add_coder' for #<PG::TypeMapAllStrings:0x00007f85ab9dd5b8> /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:866:in `update_typemap_for_default_timezone' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:652:in `exec_no_cache' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:636:in `execute_and_clear' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:894:in `add_pg_decoders' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:744:in `connect' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:285:in `rescue in block in reconnect!' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:281:in `block in reconnect!' /Users/kamipo/.rbenv/versions/2.6.1/lib/ruby/2.6.0/monitor.rb:230:in `mon_synchronize' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:280:in `reconnect!' /Users/kamipo/src/github.com/rails/rails/activerecord/test/cases/adapter_test.rb:465:in `block in <class:AdapterTestWithoutTransaction>' ```
* | Merge pull request #35585 from sharang-d/changelog-updateRafael França2019-03-121-4/+3
|\ \ | | | | | | Edit a changelog entry [ci skip]
| * | 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 tests
| * | | Add additional ERB DummyCompiler testsCliff Pruitt2019-03-121-0/+54
| |/ / | | | | | | | | | This adds a few additional tests to the commits by eileencodes (https://github.com/rails/rails/pull/35497) and rafaelfranca (https://github.com/rails/rails/commit/cfa22f1a4b5e8b95ee01a432168de2f831b3f788). The additional tests cover several more ERB tag formatting cases such as multiline tags, conditional statements that result in duplicate keys, and multiple erb statements on a single line.
* | | 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]
| * | | 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.
| * | | 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 exist
| * | | Show friendly message to install action mailbox if the related table does ↵Prathamesh Sonpatki2019-03-122-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | not exist - This is similar to the work done in https://github.com/rails/rails/pull/31534
* | | | Merge pull request #35582 from vipulnsward/kill-warning-from-guidesKasper Timm Hansen2019-03-121-1/+1
|\ \ \ \ | | | | | | | | | | Fix warnings from Guides generation
| * | | | After https://github.com/rails/rails/pull/35281 and ↵Vipul A M2019-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/pull/35036 AV warns about not having the compiled container. Use the suggested with_empty_template_cache to overcome warning
* | | | | Merge pull request #35530 from Rodrigora/patch-1Vipul A M2019-03-121-0/+11
|\ \ \ \ \ | |/ / / / |/| | | | Add note about has_many associations callbacks [ci skip]
| * | | | Add note about has_many associations callbacks [ci skip]Rodrigo2019-03-121-0/+11
| | | | | | | | | | | | | | | | | | | | Add a note explaining when the has_many associations callbacks will be called or not.
* | | | | 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]
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Fall back to parent locale before falling back to the :errors namespace
| * | | | | 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]
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Add test for 'ActiveSupport::Inflector.transliterate'
| * | | | | Fix bug with parametrize when `locale` is passedSharang Dashputre2019-03-124-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | Also add tests for parametrize and transliterate
* | | | | | 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 the guide
| * | | | | | Add `config.credentials.content_path` and `config.credentials.key_path` to ↵bogdanvlviv2019-01-173-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the guide - Fix some typos Follow up #33962
* | | | | | | [ci skip] Improve `encrypted` commands USAGEKasper Timm Hansen2019-03-111-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This streamlines the lovely foundation Bogdan added. Mainly to add guidance around encryption keys and remove some backticks. Finally it adds some mention of how to access these files from Ruby in apps. [ Kasper Timm Hansen & bogdanvlviv ]
* | | | | | | Merge pull request #34965 from bogdanvlviv/improve-rails-encrypted--helpKasper Timm Hansen2019-03-112-0/+23
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Improve output of `rails encrypted(:edit/:show) --help`
| * | | | | | Improve output of `rails encrypted(:edit/:show) --help`bogdanvlviv2019-01-172-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With these simple examples, It will be easier for users to figure out how to use these commands. Related to 68479d09ba6bbd583055672eb70518c1586ae534
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-01 16:13:04 +0000