aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #32611 from thoughtless/patch-1Rafael França2018-04-171-2/+2
|\ | | | | Correct docs on naming of sprockets manifest file
| * Correct docs on naming of sprockets manifest filePaul2018-04-171-2/+2
|/ | | | Calling this an MD5 implies that it is generated consistently based on some input. However, this value is [completely random](https://github.com/rails/sprockets/blob/fbe6e450b6f25cf3ea494fcab0e34001d0b5a0b9/lib/sprockets/manifest_utils.rb#L11-L24).
* Merge pull request #32556 from utilum/splatRyuta Kamizono2018-04-172-3/+3
|\ | | | | 2.6 warning: passing splat keyword arguments as a single Hash
| * 2.6 warning: passing splat keyword arguments as a single Hashutilum2018-04-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Ruby 2.6.0 warns about this. ``` ruby -v ruby 2.6.0dev (2018-04-04 trunk 63085) [x86_64-linux] ``` Before, see: https://travis-ci.org/rails/rails/jobs/365740163#L1262-L1264 https://travis-ci.org/rails/rails/jobs/365944863#L2121-L2174
* | Merge pull request #32594 from utilum/structure_dump_create_tableRyuta Kamizono2018-04-171-2/+2
|\ \ | | | | | | Fix test to allow IF NOT EXISTS in structure:dump
| * | Fix test to allow IF NOT EXISTS in structure:dumputilum2018-04-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: ``` $ ruby -v ruby 2.5.1p57 (2018-03-29 revision 63029) [x86_64-linux] $ ruby -w -Itest -Ilib -I../activesupport/lib -I../actionpack/lib -I../actionview/lib -I../activemodel/lib test/application/rake/multi_dbs_test.rb Run options: --seed 28744 F Failure: ApplicationTests::RakeTests::RakeMultiDbsTest#test_db:migrate_and_db:structure:dump_and_db:structure:load_works_on_all_databases [test/application/rake/multi_dbs_test.rb:70]: Expected /CREATE TABLE \"books\"/ to match "CREATE TABLE IF NOT EXISTS \"schema_migrations\" (\"version\" varchar NOT NULL PRIMARY KEY);\nCREATE TABLE IF NOT EXISTS \"ar_internal_metadata\" (\"key\" varchar NOT NULL PRIMARY KEY, \"value\" varchar, \"created_at\" datetime NOT NULL, \"updated_at\" datetime NOT NULL);\nCREATE TABLE IF NOT EXISTS \"books\" (\"id\" integer PRIMARY KEY AUTOINCREMENT NOT NULL, \"title\" varchar, \"created_at\" datetime NOT NULL, \"updated_at\" datetime NOT NULL);\nCREATE TABLE sqlite_sequence(name,seq);\nINSERT INTO \"schema_migrations\" (version) VALUES\n('20180416201805');\n\n\n". ```
* | | Merge pull request #32599 from eugeneius/rm_transaction_joinable_writerRyuta Kamizono2018-04-171-1/+0
|\ \ \ | | | | | | | | Remove unused attr_writer :joinable on Transaction
| * | | Remove unused attr_writer :joinable on TransactionEugene Kenny2018-04-171-1/+0
| | | | | | | | | | | | | | | | | | | | This was added in 280587588aba6ce13717cd6679e3f2b43d287443, but has been unused since 392eeecc11a291e406db927a18b75f41b2658253.
* | | | ActionController -> Action Controller [ci skip]Xavier Noria2018-04-171-4/+5
|/ / / | | | | | | | | | Really just an excuse to trigger edge docs generation
* | | Merge pull request #32582 from cassidycodes/better-examplesRafael França2018-04-165-16/+16
|\ \ \ | | | | | | | | Inclusive Language in Documentation Examples
| * | | Use string-based fields. [ci skip]Cassidy Kobewka2018-04-162-5/+5
| | | |
| * | | Inclusive Language in Documentation Examples [ci skip]Cassidy Kobewka2018-04-155-16/+16
| | |/ | |/|
* | | Merge pull request #32596 from bogdanvlviv/add-reference-to-5_2-from-edge-guidesRyuta Kamizono2018-04-171-0/+1
|\ \ \ | | | | | | | | Add the reference to Rails Guides 5.2 from the Edge Guides
| * | | Add the reference to Rails Guides 5.2 from the Edge Guidesbogdanvlviv2018-04-171-0/+1
| | |/ | |/| | | | | | | [ci skip]
* | | Merge pull request #32595 from jpawlyn/patch-1Rafael França2018-04-161-1/+1
|\ \ \ | |/ / |/| | Update Rails minor version from 5.1 to 5.2 [ci skip]
| * | Update Rails minor version from 5.1 to 5.2 [ci skip]Jolyon Pawlyn2018-04-161-1/+1
|/ /
* / Deprecate support for using `HOST` environment to specify server IP (#32540)Yuji Yaginuma2018-04-163-3/+35
|/ | | | | | | | | | | | At SuSE, `$HOST` is set by default and is equal to `$HOSTNAME`. https://www.suse.com/documentation/sled11/book_sle_admin/data/sec_adm_variables.html Therefore, by default, it binds to hostname instead of `localhost`. This seems not to be appropriate as default behavior. In order to avoid the name of the environment variable being used, I changed the environment variable from `HOST` to `BINDING`. Fixes #29516.
* Merge pull request #32573 from chloerei/fix-redis-store-clear-namespaceGeorge Claghorn2018-04-152-1/+19
|\ | | | | Fix redis store clear keys outside the namespace
| * Fix redis store clear keys outside the namespaceRei2018-04-152-1/+19
| | | | | | | | | | | | | | | | | | | | Namespace not working in RedisCacheStore#clear method. Bacause namespace = merged_options(options)[namespace] is always nil, Correct is namespace = merged_options(options)[:namespace]
* | Merge pull request #32576 from r7kamura/require-benchmarkAndrew White2018-04-141-0/+1
|\ \ | |/ |/| Add missing `require "benchmark"`
| * Add missing `require "benchmark"`r7kamura2018-04-151-0/+1
|/
* Merge pull request #32566 from chrisarcand/fix-broken-nodocsRafael França2018-04-133-3/+3
|\ | | | | Fix broken nodocs
| * Fix broken nodocsChris Arcand2018-04-133-3/+3
| | | | | | | | | | This commit fixes all references in the codebase missing a trailing :, which causes the nodoc not to actually work :) [skip ci]
* | Merge pull request #32553 from ↵Rafael França2018-04-131-1/+1
|\ \ | |/ |/| | | | | raderj89/jaredrader/update-docs-ActiveJob__Serializers__ObjectSerializer#deserialize-for-pr fix spelling in docs for ActiveJob::Serializers::ObjectSerializer#deserialize
| * fix spelling in docs for ActiveJob::Serializers::ObjectSerializer#deserializeJared Rader2018-04-131-1/+1
| |
* | Fix rendering a differently-formatted partial after cachingGeorge Claghorn2018-04-134-2/+26
| |
* | Merge pull request #32561 from TheAssailant/storage-keep-gitignoreGeorge Claghorn2018-04-131-1/+4
|\ \ | | | | | | Add .keep exception for storage folder
| * | Add .keep exception for storage folderPaul2018-04-131-1/+4
| | | | | | | | | Fixes https://github.com/rails/rails/issues/32546 by including the `.keep` file in the .gitignore, bringing the `storage` folder in line with the `tmp` and `log` folders.
* | | Merge pull request #32562 from szTheory/patch-1 [ci skip]Guillermo Iguaran2018-04-131-1/+1
|\ \ \ | | | | | | | | Update security.md with latest underground market prices
| * | | Update security.md with latest underground market pricesszTheory2018-04-131-1/+1
| |/ / | | | | | | Updated underground market prices according to the 2017 Symantec ISTR (was previously citing the 2008 report)
* / / couple of edits [ci skip]Xavier Noria2018-04-131-2/+2
|/ / | | | | | | Legit, but really an excuse to trigger the master hook in the docs server.
* / Use `SecureRandom.random_bytes` instead of `SecureRandom.bytes`yuuji.yaginuma2018-04-131-1/+1
|/ | | | | | | | | | `SecureRandom.byes` was added in Ruby 2.4. So, 5-2-stable build is broken because using `SecureRandom.bytes`. https://travis-ci.org/rails/rails/jobs/365740667 Also, `SecureRandom.byes` seems to an undocumented method. If need random binary strings, should use `SecureRandom.random_bytes`. https://github.com/ruby/ruby/blob/trunk/lib/securerandom.rb
* Fix database.yml mergingeileencodes2018-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ok so apparently you can not just have a `default:` that manually is merged in with YAML but you can also have a special "shared" config that is automatically merged. Example: ``` shared: adapter: mysql2 host: <%= ENV["DB_HOST"] || "localhost" %> username: root connect_timeout: 0 pool: 100 reconnect: true development: database: development_db adapter: mysql2 ``` To fix, only create a DatabaseConfig object when an adapter, database, or URL are present. The merging behavior for `shared` doesn't work with a 3-tier config. I don't think it worked before this change either - since Rails doesn't know which point to merge it in. That's something we may have to fix with the refactoring I'm working on.
* Merge pull request #32549 from stephensolis/csp-websocketsRafael França2018-04-122-1/+9
|\ | | | | Add WebSocket URI support to CSP DSL mappings
| * Add WebSocket URI support to CSP DSL mappingsStephen Solis2018-04-122-1/+9
| |
* | Merge pull request #32551 from chrisarcand/no-doc-original-sumRafael França2018-04-121-1/+1
|\ \ | | | | | | Don't doc _original_sum_with_required_identity
| * | Don't doc _original_sum_with_required_identityChris Arcand2018-04-121-1/+1
| |/ | | | | | | It's not public API so don't document it.
* | Merge pull request #32539 from chancancode/anticompressRafael França2018-04-125-73/+181
|\ \ | |/ |/| Fix ActiveSupport::Cache compression
| * Fix `ActiveSupport::Cache` compressionGodfrey Chan2018-04-113-37/+60
| | | | | | | | (See previous commit for a description of the issue)
| * Add failing test for compression bugGodfrey Chan2018-04-113-38/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | On Rails 5.2, when compression is enabled (which it is by default), the actual value being written to the underlying storage is actually _bigger_ than the uncompressed raw value. This is because the `@marshaled_value` instance variable (typically) gets serialized with the entry object, which is then written to the underlying storage, essentially double-storing every value (once uncompressed, once possibly compressed). This regression was introduced in #32254.
* | Merge pull request #32542 from ↵George Claghorn2018-04-121-2/+3
|\ \ | | | | | | | | | | | | teddywing/active-support-cache-store--fix-end-tag-in-read-method-documentation Cache::Store#read: Fix fixed-width end tag in docs
| * | Cache::Store#read: Fix fixed-width end tag in docsTeddy Wing2018-04-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | * Fix the ending `</tt>` tag for `:expires_in`. Otherwise, the "or" is set in fixed-width also. * Re-wrap paragraph to 80 columns. [ci skip]
* | | Merge pull request #31913 from rywall/define-callbacks-descMatthew Draper2018-04-122-1/+13
|\ \ \ | |/ / |/| | Define callbacks on descendants.
| * | No need to define methods on descendants.Ryan Wallace2018-02-241-18/+18
| | | | | | | | | | | | Addresses feedback from https://github.com/rails/rails/pull/31913#issuecomment-365983580
| * | Define callbacks on descendants.Ryan Wallace2018-02-062-17/+29
| | | | | | | | | | | | We set callbacks on all descendants, so we need to make sure that they are also defined on all descendants as well.
* | | Merge pull request #32538 from 284km/fix_guides_security_linkRafael França2018-04-121-1/+1
|\ \ \ | |_|/ |/| | Fix MySpace Samy worm link [ci skip]
| * | Fix MySpace Samy worm link [ci skip]284km2018-04-121-1/+1
|/ / | | | | | | The old link https://samy.pl/popular/tech.html is 404 not found.
* | Merge pull request #32536 from ↵Rafael França2018-04-113-3/+12
|\ \ | | | | | | | | | | | | lsylvester/fix-immutable-relation-error-with-http-caching-and-collection-caching Fix ActiveRecord::ImmutableRelation is raised when collection caching and HTTP caching are used together
| * | don't check for immutability when setting skip_preloading as it doesn't ↵Lachlan Sylvester2018-04-123-3/+12
|/ / | | | | | | effect the arel and the arel may already be generated by fresh_when
* | Merge pull request #32527 from nsgc/use_frozen_string_literalRafael França2018-04-111-0/+2
|\ \ | | | | | | Use frozen string literal
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-11 15:59:42 +0000