aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make the master.key readable only by the ownerJose Luis Duran2018-04-193-0/+27
| | | | | | | | | | | | | | This change may only apply to POSIX-compliant systems. Previously: $ ls -l config/master.key -rw-r--r-- 1 owner group 32 Jan 1 00:00 master.key Now: $ ls -l config/master.key -rw------- 1 owner group 32 Jan 1 00:00 master.key
* Merge pull request #32607 from yaroslav/feature/nonce-for-javascript_include_tagAndrew White2018-04-184-0/+28
|\ | | | | Add the `nonce: true` option for `javascript_include_tag` helper.
| * Add the `nonce: true` option for `javascript_include_tag` helper.Yaroslav Markin2018-04-174-0/+28
| |
* | Merge pull request #32326 from ↵Guillermo Iguaran2018-04-181-1/+5
|\ \ | | | | | | | | | | | | q-centrix/perf-improvement-translation-helper-default-array Only create an array with default options if we have default options
| * | Only create an array with default options if we have default optionsDillon Welch2018-03-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the options passed in don't have a default key, there's no point in creating an array from those empty results when we can just go straight to creating an empty array. Benchmarks: ```ruby master_version with false {:FREE=>-2497, :T_STRING=>52, :T_ARRAY=>2000, :T_HASH=>1000, :T_IMEMO=>1} master_version with true {:FREE=>-3001, :T_ARRAY=>2000, :T_HASH=>1000} fast_version with false {:FREE=>-1001, :T_ARRAY=>1000} fast_version with true {:FREE=>-3001, :T_ARRAY=>2000, :T_HASH=>1000} Warming up -------------------------------------- master_version with false 104.985k i/100ms master_version with true 118.737k i/100ms fast_version with false 206.013k i/100ms fast_version with true 107.005k i/100ms Calculating ------------------------------------- master_version with false 1.970M (±24.6%) i/s - 8.924M in 5.010302s master_version with true 2.152M (±12.4%) i/s - 10.686M in 5.051588s fast_version with false 5.613M (±19.6%) i/s - 26.782M in 5.003740s fast_version with true 2.027M (±15.8%) i/s - 9.951M in 5.065670s Comparison: fast_version with false: 5613159.2 i/s master_version with true: 2152354.4 i/s - 2.61x slower fast_version with true: 2027296.0 i/s - 2.77x slower master_version with false: 1969824.9 i/s - 2.85x slower ``` Benchmark code: ```ruby begin require "bundler/inline" rescue LoadError => e $stderr.puts "Bundler version 1.10 or later is required. Please update your Bundler" raise e end gemfile(true) do source "https://rubygems.org" gem "benchmark-ips" gem "rails" end def allocate_count GC.disable before = ObjectSpace.count_objects yield after = ObjectSpace.count_objects after.each { |k,v| after[k] = v - before[k] } after[:T_HASH] -= 1 # probe effect - we created the before hash. GC.enable result = after.reject { |k,v| v == 0 } GC.start result end def master_version(key) Array({}.delete(:default)).compact end def fast_version(key) if key Array({}.delete(:default)).compact else [] end end def test puts "master_version with false" puts allocate_count { 1000.times { master_version(false) } } puts "master_version with true" puts allocate_count { 1000.times { master_version(true) } } puts "fast_version with false" puts allocate_count { 1000.times { fast_version(false) } } puts "fast_version with true" puts allocate_count { 1000.times { fast_version(true) } } Benchmark.ips do |x| x.report("master_version with false") { master_version(false) } x.report("master_version with true") { master_version(true) } x.report("fast_version with false") { fast_version(false) } x.report("fast_version with true") { fast_version(true) } x.compare! end end test ```
* | | Remove unused literal introduced in #32602Andrew White2018-04-181-1/+0
| | |
* | | Don't link issue number in CHANGELOG [ci skip]Andrew White2018-04-181-1/+1
| | |
* | | Merge pull request #32602 from Envek/fix/csp-multiple-noncesAndrew White2018-04-183-13/+94
|\ \ \ | | | | | | | | Output only one nonce in CSP header per request
| * | | Pass nonce to CSP policy from outsideAndrew White2018-04-183-53/+97
| | | |
| * | | Output only one nonce in CSP header per requestAndrey Novikov2018-04-173-22/+59
| | | |
* | | | Merge pull request #32616 from cassidycodes/validates-inclusion-exampleRyuta Kamizono2018-04-181-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update validates_inclusion_of example in Docs [ci skip]
| * | | | Update validates_inclusion_of exampleCassidy Kobewka2018-04-171-1/+1
|/ / / /
* | | | Merge pull request #32612 from utilum/splat_actionviewRafael França2018-04-171-2/+7
|\ \ \ \ | | | | | | | | | | Ruby 2.6 warning: passing splat keyword arguments as a single Hash
| * | | | Ruby 2.6 warning: passing splat keyword arguments as a single Hashutilum2018-04-171-2/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: ``` $ ruby -v ruby 2.6.0dev (2018-04-04 trunk 63085) [x86_64-linux] $ bundle exec rake test:template ... /rails/actionview/lib/action_view/digestor.rb:76: warning: passing splat keyword arguments as a single Hash to `find_all' ```
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-15 11:15:47 +0000