aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Raise UnknownAttributeError when unknown column is passed to insert_all and ↵Josef Šimánek2019-03-162-0/+14
| | | | friends.
* Merge pull request #35634 from sharang-d/update-parameterize-docsRyuta Kamizono2019-03-162-6/+10
|\ | | | | Update docs for 'parameterize()' [ci skip]
| * Update docs for 'parameterize()' [ci skip]Sharang Dashputre2019-03-162-6/+10
| |
* | Engines are reloaded in Zeitwerk mode [closes #35618]Xavier Noria2019-03-153-16/+24
|/
* Merge pull request #35628 from jhawthorn/file_update_any_extensionAaron Patterson2019-03-152-1/+15
|\ | | | | Match evented checker behavior on dir with no exts
| * Match evented checker behavior on dir with no extsJohn Hawthorn2019-03-152-1/+15
| | | | | | | | | | | | | | | | | | | | When FileUpdateChecker is passed a directory and given an empty array of extensions to match on, it will match any extension. Previously, EventedFileUpdateChecker would never match any files when given an empty array. This commit makes it EventedFileUpdateChecker match FileUpdateChecker, and watch all extensions when given an empty array.
* | Merge pull request #35623 from jhawthorn/actionview_cacheAaron Patterson2019-03-156-98/+13
|\ \ | | | | | | Make Template::Resolver always cache
| * | Remove updated_at from TemplatesJohn Hawthorn2019-03-154-18/+9
| | |
| * | Make Template::Resolver always cacheJohn Hawthorn2019-03-153-80/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All actionview caches are already cleared at the start of each request (when Resolver.caching is false) by PerExecutionDigestCacheExpiry, which calls LookupContext::DetailsKey.clear (which clears all caches). Because caches are always cleared per-request in dev, we shouldn't need this extra logic to compare mtimes and conditionally reload templates. This should make templates slightly faster in development (particularly multiple renders of the same template)
* | | Merge pull request #35627 from Futurelearn/seb-rename-view-run-methodAaron Patterson2019-03-153-3/+3
|\ \ \ | |_|/ |/| | Rename `ActionView::Base#run`
| * | Rename `ActionView::Base#run` to `#_run`Seb Jacobs2019-03-153-3/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a recent change by @tenderlove to Action view which introduced `ActionView::Base#run` [1]. We ran into an issue with our application because one of the core concepts in our domain model is a `Run` which is exposed in most of our views as a helper method, which now conflicts with this new method. Although this is a public method it is not really meant to be part of the public API. In order to discourage public use of this method and to reduce the chances of this method conflicting with helper methods we can prefix this method with an underscore, renaming this method to `_run`. [1] https://github.com/rails/rails/commit/c740ebdaf5
* | Merge pull request #35599 from y-yagi/improve_environment_argument_handlingYuji Yaginuma2019-03-157-12/+48
|\ \ | | | | | | Properly expand the environment's name in all commands
| * | Properly expand the environment's name in all commandsyuuji.yaginuma2019-03-157-12/+48
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Since 3777701f1380f3814bd5313b225586dec64d4104, the environment's name is automatically expanded in console and dbconsole commands. In order to match the behavior between the commands, fixes it to have the same behavior of all the commands. This behavior is defined in `EnvironmentArgument`. Since `EnvironmentArgument` also defines the environment option, it is reused. However, since desc was not content that can be used in all comments, fixed desc to be defined for each command.
* / bumps ZeitwerkXavier Noria2019-03-142-3/+3
|/
* GCS service: skip unnecessary bucket lookupsGeorge Claghorn2019-03-141-1/+1
|
* Merge pull request #35607 from ↵Yuji Yaginuma2019-03-142-0/+4
|\ | | | | | | | | y-yagi/ensure_application_work_without_tmp_directory Make application work without tmp directory
| * Make application work without tmp directoryyuuji.yaginuma2019-03-142-0/+4
|/ | | | | | | | | | | | The tmp directory is added to version control in the newly created application. This was added in Rails 5.0.0(https://github.com/rails/rails/commit/f06ce4c12a396795a3b2c1812951d9277bcb3a82). However, applications created before that are not guaranteed to have the tmp directory. If the tmp directory does not exist, writing to the key file raise error. This is a bit incompatible. So I fixed that create the directory before writing a key.
* Merge pull request #35605 from richardmonette/support-slice-assign-safe-bufferRafael França2019-03-132-2/+38
|\ | | | | support slice assignment on SafeBuffer
| * support slice assignment on SafeBufferRichard Monette2019-03-132-2/+38
| |
* | Fix secret_key_base for Railtieseileencodes2019-03-132-0/+2
| | | | | | | | | | | | This was missed in the security fix for local dev. CI doesn't have a tmp directory in the apps built for testing so these end up failing. This adds the secret_key_base so we don't need to generate one.
* | Add secret token for action mailbox testseileencodes2019-03-131-0/+1
|/ | | | | | | We need to create a secret token in the application so that the travis build doesn't error when trying to create a file in the tmp directory. Fixes https://travis-ci.org/rails/rails/jobs/505908163#L6811
* 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
| | | | This reverts commit 65f2eeaaf5774f0891fff700f4defb0b90a05789.
* 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 13:55:44 +0000