aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| * | Use frozen string literalNaoki Nishiguchi2018-04-111-0/+2
| | |
* | | Remove link for the kindle version of guides on edgeRafael Mendonça França2018-04-111-1/+3
|/ / | | | | | | | | | | See https://github.com/rails/rails-docs-server/pull/8 for reason. [ci skip]
* | Unlock dalli versionyuuji.yaginuma2018-04-112-3/+3
| | | | | | | | | | The issue was fixed with https://github.com/petergoldstein/dalli/pull/679, and a new version containing that fix was released.
* | Merge pull request #32496 from yhirano55/fix_turbolinks_warning_in_railtiesRafael França2018-04-101-3/+3
|\ \ | | | | | | Fix turbolinks warning in railties test
| * | Fix turbolinks warning in railties testYoshiyuki Hirano2018-04-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | * Upgrade turbolinks from v5.0.1 to v5.1.0 * Fix warning in railties test lib/turbolinks/assertions.rb:17: warning: assigned but unused variable - visit_action
* | | Merge pull request #32484 from kddeisz/default-headersRafael França2018-04-105-6/+24
|\ \ \ | | | | | | | | Include default headers by default in API mode
| * | | Include default headers by default in API modeKevin Deisz2018-04-065-6/+24
| | | | | | | | | | | | | | | | ActionDispatch's default headers are now moved into their own module that are by default included in both Base and API. This allows API-mode applications to take advantage of the default security headers, as well as providing an easy way to add more.
* | | | Specify which series I'm talking aboutRafael Mendonça França2018-04-101-1/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | Update our security policy to include all releases in the current seriesRafael Mendonça França2018-04-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want people to jump from the last release in the previous series (4.2) straing to the first release in the current series that is support (5.1), so we should be supporting the entire series for severe security issues. This will not be a problem because usually we only have 3 releases in a series and backporting patches inside the same series is not harder than backporting to a previous series.
* | | | Allow use of minitest-rails gem with Rails test runneryuuji.yaginuma2018-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add explicit global namespace to `Rails::TestUnit::Runner` to resolve a namespace conflict between `minitest-rails` and Rails test runner. Fixes #31324
* | | | Remove upper bound on Capybaraeileencodes2018-04-104-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no reason to block future versions of Capybara since we don't _know_ they are going to break. How will we know if we have a conservative option set? This change prevents us from blocking users who want to upgrade in the future.
* | | | Merge pull request #32517 from javan/ast/no-root-in-jsonJavan Makhmali2018-04-102-1/+24
|\ \ \ \ | | | | | | | | | | Active Storage: Always exclude JSON root from direct_uploads#create response
| * | | | Always exclude JSON root from direct_uploads#create responseJavan Makhmali2018-04-102-1/+24
|/ / / / | | | | | | | | | | | | | | | | | | | | The JavaScript component expects a bare response. Fixes #32365
* | | | 4.2 is still maintainedRafael Mendonça França2018-04-101-1/+1
| | | | | | | | | | | | | | | | It is the last major release series.
* | | | Merge pull request #32498 from eugeneius/mutation_tracker_merge_changesRyuta Kamizono2018-04-102-1/+9
|\ \ \ \ | | | | | | | | | | Prevent changes_to_save from mutating attributes
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 10:25:40 +0000